diff --git a/...ew/Template/Widgetgraph/Configuration.xml → ...ew/Template/Portlettext/Configuration.xml b/...ew/Template/Widgetgraph/Configuration.xml → ...ew/Template/Portlettext/Configuration.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="Template" version="1.0" extends="Extensioninstancesviewstemplates">
-    <name>VIEW_TEMPLATE_WIDGETGRAPH_NAME</name>
+    <name>VIEW_TEMPLATE_PORTLETTEXT_NAME</name>
     <author>Amy Stephen</author>
     <create_date>August 2012</create_date>
     <copyright>Copyright (C) 2012 Amy Stephen. All rights reserved.</copyright>
     <license>GNU GPL v 2, or later and MIT, see License folder</license>
     <author_email>AmyStephen@gmail.com</author_email>
     <author_url>http://molajo.org</author_url>
     <version>1.0</version>
-    <description>VIEW_TEMPLATE_WIDGETGRAPH_DESCRIPTION</description>
-    <model name="Widgetgraph"/>
+    <description>VIEW_TEMPLATE_PORTLETTEXT_DESCRIPTION</description>
+    <model name="Portlettext"/>
 </extension>
diff --git a/...w/Template/Widgetaudio/Language/en-GB.ini → ...w/Template/Portlettext/Language/en-GB.ini b/...w/Template/Widgetaudio/Language/en-GB.ini → ...w/Template/Portlettext/Language/en-GB.ini
@@ -3,5 +3,5 @@
 ; License GNU GPL v 2, or later and MIT, see License folder
 ; Note : All ini files need to be saved as UTF-8
 
-VIEW_TEMPLATE_WIDGETAUDIO_NAME="Widgetaudio View"
-VIEW_TEMPLATE_WIDGETAUDIO_DESCRIPTION="Default View for Widgetaudio Resource."
+VIEW_TEMPLATE_PORTLETTEXT_NAME="Portlettext View"
+VIEW_TEMPLATE_PORTLETTEXT_DESCRIPTION="Default View for Portlettext Resource."
diff --git a/...on/View/Template/Widgettext/View/Body.php → ...n/View/Template/Portlettext/View/Body.php b/...on/View/Template/Widgettext/View/Body.php → ...n/View/Template/Portlettext/View/Body.php
diff --git a/.../View/Template/Widgettext/View/Custom.php → ...View/Template/Portlettext/View/Custom.php b/.../View/Template/Widgettext/View/Custom.php → ...View/Template/Portlettext/View/Custom.php
@@ -5,10 +5,10 @@
  * @license    GNU GPL v 2, or later and MIT, see License folder
  */
 defined('MOLAJO') or die; ?>
-<div class="ui-widget-header">
+<div class="ui-portlet-header">
     <h4>Text</h4>
 </div>
-<div class="ui-widget-content">
+<div class="ui-portlet-content">
     <strong>Title</strong>
 	<p>Cupcake ipsum dolor. Sit amet bear claw I love tiramisu liquorice halvah applicake jelly. Sweet roll liquorice macaroon powder cheesecake tiramisu.</p>
 </div>
diff --git a/.../View/Template/Widgettext/View/Footer.php → ...View/Template/Portlettext/View/Footer.php b/.../View/Template/Widgettext/View/Footer.php → ...View/Template/Portlettext/View/Footer.php
diff --git a/source/Molajo/Extension/View/Template/Portletvideo/Configuration.xml b/source/Molajo/Extension/View/Template/Portletvideo/Configuration.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="Template" version="1.0" extends="Extensioninstancesviewstemplates">
+    <name>VIEW_TEMPLATE_PORTLETVIDEO_NAME</name>
+    <author>Amy Stephen</author>
+    <create_date>August 2012</create_date>
+    <copyright>Copyright (C) 2012 Amy Stephen. All rights reserved.</copyright>
+    <license>GNU GPL v 2, or later and MIT, see License folder</license>
+    <author_email>AmyStephen@gmail.com</author_email>
+    <author_url>http://molajo.org</author_url>
+    <version>1.0</version>
+    <description>VIEW_TEMPLATE_PORTLETVIDEO_DESCRIPTION</description>
+    <model name="Portletvideo"/>
+</extension>
diff --git a/...iew/Template/Widgetvideo/Css/template.css → ...ew/Template/Portletvideo/Css/template.css b/...iew/Template/Widgetvideo/Css/template.css → ...ew/Template/Portletvideo/Css/template.css
diff --git a/source/Molajo/Extension/View/Template/Portletvideo/Language/en-GB.ini b/source/Molajo/Extension/View/Template/Portletvideo/Language/en-GB.ini
@@ -0,0 +1,7 @@
+; Molajo Project
+; Copyright (C) 2012 Amy Stephen. All rights reserved.
+; License GNU GPL v 2, or later and MIT, see License folder
+; Note : All ini files need to be saved as UTF-8
+
+VIEW_TEMPLATE_PORTLETVIDEO_NAME="Portletvideo View"
+VIEW_TEMPLATE_PORTLETVIDEO_DESCRIPTION="Default View for Portletvideo Resource."
diff --git a/...n/View/Template/Widgetvideo/View/Body.php → .../View/Template/Portletvideo/View/Body.php b/...n/View/Template/Widgetvideo/View/Body.php → .../View/Template/Portletvideo/View/Body.php
diff --git a/...View/Template/Widgetvideo/View/Custom.php → ...iew/Template/Portletvideo/View/Custom.php b/...View/Template/Widgetvideo/View/Custom.php → ...iew/Template/Portletvideo/View/Custom.php
@@ -5,10 +5,10 @@
  * @license    GNU GPL v 2, or later and MIT, see License folder
  */
 defined('MOLAJO') or die; ?>
-<div class="ui-widget-header">
+<div class="ui-portlet-header">
     <h4>Video</h4>
 </div>
-<div class="ui-widget-content">
+<div class="ui-portlet-content">
 	<div class="video-wrapper">
 		<div class="video-container">
 			<iframe src="http://player.vimeo.com/video/6284199?title=0&byline=0&portrait=0" width="800" height="450" frameborder="0"></iframe>

diff --git a/...View/Template/Widgetvideo/View/Footer.php → ...iew/Template/Portletvideo/View/Footer.php b/...View/Template/Widgetvideo/View/Footer.php → ...iew/Template/Portletvideo/View/Footer.php
diff --git a/source/Molajo/Extension/View/Template/Widgetquicklinks/Configuration.xml b/source/Molajo/Extension/View/Template/Widgetquicklinks/Configuration.xml
diff --git a/source/Molajo/Extension/View/Template/Widgetquicklinks/Language/en-GB.ini b/source/Molajo/Extension/View/Template/Widgetquicklinks/Language/en-GB.ini
diff --git a/source/Molajo/Extension/View/Template/Widgetsysteminfo/Configuration.xml b/source/Molajo/Extension/View/Template/Widgetsysteminfo/Configuration.xml
diff --git a/source/Molajo/Extension/View/Template/Widgetsysteminfo/Language/en-GB.ini b/source/Molajo/Extension/View/Template/Widgetsysteminfo/Language/en-GB.ini
diff --git a/source/Molajo/Extension/View/Template/Widgetvideo/Configuration.xml b/source/Molajo/Extension/View/Template/Widgetvideo/Configuration.xml
diff --git a/source/Molajo/Extension/View/Template/Widgetvideo/Language/en-GB.ini b/source/Molajo/Extension/View/Template/Widgetvideo/Language/en-GB.ini
diff --git a/source/Molajo/Site/2/Media/molajo.sql b/source/Molajo/Site/2/Media/molajo.sql