diff --git a/.travis.yml b/.travis.yml
index 505e8d2..7a70cdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: php
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION="2.0.x-dev"
+    - COMPOSER_ROOT_VERSION="2.x-dev"
 
 matrix:
   include:
diff --git a/lang/ar.yml b/lang/ar.yml
index 95761e5..cedef65 100644
--- a/lang/ar.yml
+++ b/lang/ar.yml
@@ -5,7 +5,7 @@ ar:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'مساحات التطبيقات المصغرة'
     SINGULARNAME: 'مساحة التطبيقات المصغرة'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'التطبيقات المصغرة المتاحة'
     AVAILWIDGETS: 'اضغط على عنوان تطبيق مصغر بالأسفل لاستخدامه بهذه الصفحة.'
     INUSE: 'التطبيقات المصغرة المستخدمة حاليا'
diff --git a/lang/de.yml b/lang/de.yml
index 1a69b74..437a3ed 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -5,7 +5,7 @@ de:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: Widgetbereiche
     SINGULARNAME: Widgetbereich
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Vorhandene Widgets'
     AVAILWIDGETS: 'Klicke den Widget Titel, um es zu benutzen.'
     INUSE: 'Benutzte Widgets'
diff --git a/lang/en.yml b/lang/en.yml
index 856bc25..5d797f3 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,19 +1,25 @@
 en:
   SilverStripe\Widgets\Extensions\WidgetPageExtension:
     INHERITSIDEBAR: 'Inherit Sidebar From Parent'
-  SilverStripe\Widgets\Model\Widget:
-    PLURALNAME: Widgets
-    SINGULARNAME: Widget
-  SilverStripe\Widgets\Model\WidgetArea:
-    PLURALNAME: 'Widget Areas'
-    SINGULARNAME: 'Widget Area'
-  SilverStripe\Widgets\Templates\SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Available Widgets'
     AVAILWIDGETS: 'Click a widget title below to use it on this page.'
     INUSE: 'Widgets currently used'
     NOAVAIL: 'There are currently no widgets available.'
     TOSORT: 'To sort currently used widgets on this page, drag them up and down.'
-  SilverStripe\Widgets\Templates\WidgetDescription_ss:
+  SilverStripe\Widgets\Model\Widget:
+    PLURALNAME: Widgets
+    PLURALS:
+      one: 'A Widget'
+      other: '{count} Widgets'
+    SINGULARNAME: Widget
+  SilverStripe\Widgets\Model\WidgetArea:
+    PLURALNAME: 'Widget Areas'
+    PLURALS:
+      one: 'A Widget Area'
+      other: '{count} Widget Areas'
+    SINGULARNAME: 'Widget Area'
+  WidgetDescription_ss:
     CLICKTOADDWIDGET: 'Click to add this widget'
-  SilverStripe\Widgets\Templates\WidgetEditor_ss:
+  WidgetEditor_ss:
     DELETE: Delete
diff --git a/lang/eo.yml b/lang/eo.yml
index 15929eb..28c0559 100644
--- a/lang/eo.yml
+++ b/lang/eo.yml
@@ -5,7 +5,7 @@ eo:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Fenestraĵaj zonoj'
     SINGULARNAME: 'Fenestraĵa zono'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Disponeblaj fenestraĵoj'
     AVAILWIDGETS: 'Alklaku sube titolon de fenestraĵo por uzi ĝin en ĉi tiu paĝo.'
     INUSE: 'Fenestraĵoj aktuale uzataj'
diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml
index 5b31c5e..004259f 100644
--- a/lang/fa_IR.yml
+++ b/lang/fa_IR.yml
@@ -5,7 +5,7 @@ fa_IR:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'محیط ویجت ها'
     SINGULARNAME: 'محیط ویجت'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'ویجت های موجود'
     AVAILWIDGETS: 'بر روی عنوان یک ویجت در پایین کلیک کنید تا آن را در این صفحه بکار بگیرید.'
     INUSE: 'ویجت هایی که در حال حاضر استفاده می شوند'
diff --git a/lang/fi.yml b/lang/fi.yml
index 25bf255..97e5309 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -5,7 +5,7 @@ fi:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Vimpain alueet'
     SINGULARNAME: 'Vimpain alue'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Käytettävissä olevat vimpaimet'
     AVAILWIDGETS: 'Napsauta vimpaimen otsikkoa alla ottaaksesi se käyttöön tällä sivulla.'
     INUSE: 'Käytössä olevat vimpaimet'
diff --git a/lang/hr.yml b/lang/hr.yml
index e860d5f..64add83 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -5,7 +5,7 @@ hr:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Zone widgeta'
     SINGULARNAME: 'Zona widgeta'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Dostupni widgeti'
     AVAILWIDGETS: 'Kliknite na naziv widgeta ispod za korištenje na ovoj stranici'
     INUSE: 'Trenutno korišteni widgeti'
diff --git a/lang/it_IT.yml b/lang/it_IT.yml
index a82ce18..a5f387f 100644
--- a/lang/it_IT.yml
+++ b/lang/it_IT.yml
@@ -5,7 +5,7 @@ it_IT:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Aree Widget'
     SINGULARNAME: 'Area Widget'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Widgets disponibili'
     AVAILWIDGETS: 'Clicca sul titolo di un widget qui sotto per usarlo in questa pagina'
     INUSE: 'Widgets attualmente utilizzati'
diff --git a/lang/nl.yml b/lang/nl.yml
index dd52b82..830631a 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,5 +1,5 @@
 nl:
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Beschikbare Widgets'
     AVAILWIDGETS: 'Klik op een widget titel hieronder, om de widget te gebruiken op deze pagina.'
     INUSE: 'Huidige gebruikte Widgets'
diff --git a/lang/pl_PL.yml b/lang/pl_PL.yml
index 5b76731..8910d94 100644
--- a/lang/pl_PL.yml
+++ b/lang/pl_PL.yml
@@ -1,5 +1,5 @@
 pl_PL:
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Dostępne widżety'
     AVAILWIDGETS: 'Kliknij w tytuł widżetu, aby używać go na tej stronie.'
     INUSE: 'Obecnie stosowane widżety'
diff --git a/lang/ro_RO.yml b/lang/ro_RO.yml
index b279ce9..cf397c6 100644
--- a/lang/ro_RO.yml
+++ b/lang/ro_RO.yml
@@ -1,5 +1,5 @@
 ro_RO:
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Widget-uri disponibile'
     AVAILWIDGETS: 'Faceți clic pe un titlu widget de mai jos pentru a-l folosi pe aceasta pagina.'
     INUSE: 'Widget-uri utilizate în prezent'
diff --git a/lang/ru.yml b/lang/ru.yml
index b379c7a..1cc0956 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -5,7 +5,7 @@ ru:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Области виджетов'
     SINGULARNAME: 'Область виджета'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Доступные виджеты'
     AVAILWIDGETS: 'Щелкните заголовок виджета ниже, чтобы использовать его на этой странице.'
     INUSE: 'Используемые виджеты'
diff --git a/lang/sk.yml b/lang/sk.yml
index 3e295ce..71ae736 100644
--- a/lang/sk.yml
+++ b/lang/sk.yml
@@ -5,7 +5,7 @@ sk:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Oblasti widgetu'
     SINGULARNAME: 'Oblasť widgetu'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Dostupné widgety'
     AVAILWIDGETS: 'Kliknite na názov widgetu pre jeho použitie na tejto stránke.'
     INUSE: 'Momentálne používané widgety.'
diff --git a/lang/sv.yml b/lang/sv.yml
index e82dfca..89809d2 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -5,7 +5,7 @@ sv:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: Widgetområden
     SINGULARNAME: Widgetområde
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Tillgängliga widgets'
     AVAILWIDGETS: 'Klicka på en widget nedan för att använda den på sidan.'
     INUSE: 'Använda widgets'
diff --git a/lang/zh.yml b/lang/zh.yml
index 1d87607..af291cb 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -5,7 +5,7 @@ zh:
   SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 小工具区域
     SINGULARNAME: 小工具区域
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 可用的小工具
     AVAILWIDGETS: 点击下方的小工具名称即可在此页上使用。
     INUSE: 当前使用的小工具
diff --git a/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss b/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss
index 0455fa4..d17ac32 100644
--- a/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss
+++ b/templates/SilverStripe/Widgets/Forms/WidgetAreaEditor.ss
@@ -1,8 +1,8 @@
-<div class="WidgetAreaEditor field" id="WidgetAreaEditor-$Name" name="$Name"<% if MaxWidgets %> maxwidgets="$MaxWidgets"<% end_if %>>
+<div class="WidgetAreaEditor field" id="WidgetAreaEditor-$Name" name="$Name"<% if $MaxWidgets %> maxwidgets="$MaxWidgets"<% end_if %>>
 	<input type="hidden" id="$Name" name="$IdxField" value="$Value" />
 	<div class="availableWidgetsHolder">
-		<h2><% _t('WidgetAreaEditor_ss.AVAILABLE', 'Available Widgets') %></h2>
-		<p class="message"><% _t('WidgetAreaEditor_ss.AVAILWIDGETS', 'Click a widget title below to use it on this page.') %></p>
+		<h2><%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.AVAILABLE 'Available Widgets' %></h2>
+		<p class="message"><%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.AVAILWIDGETS 'Click a widget title below to use it on this page.' %></p>
 		<div class="availableWidgets" id="availableWidgets-$Name">
 			<% if $AvailableWidgets %>
 				<% loop $AvailableWidgets %>
@@ -10,14 +10,14 @@
 				<% end_loop %>
 			<% else %>
 				<div class="NoWidgets" id="NoWidgets-$Name">
-					<p><% _t('WidgetAreaEditor_ss.NOAVAIL', 'There are currently no widgets available.') %></p>
+					<p><%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.NOAVAIL 'There are currently no widgets available.' %></p>
 				</div>
 			<% end_if %>
 		</div>
 	</div>
 	<div class="usedWidgetsHolder">
-		<h2><% _t('WidgetAreaEditor_ss.INUSE', 'Widgets currently used') %></h2>
-		<p class="message"><% _t('WidgetAreaEditor_ss.TOSORT', 'To sort currently used widgets on this page, drag them up and down.') %></p>
+		<h2><%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.INUSE 'Widgets currently used' %></h2>
+		<p class="message"><%t SilverStripe\\Widgets\\Forms\\WidgetAreaEditor_ss.TOSORT 'To sort currently used widgets on this page, drag them up and down.' %></p>
 
 		<div class="usedWidgets" id="usedWidgets-$Name">
 			<% if $UsedWidgets %>
diff --git a/templates/SilverStripe/Widgets/Model/WidgetArea.ss b/templates/SilverStripe/Widgets/Model/WidgetArea.ss
index 27a5000..32ca772 100644
--- a/templates/SilverStripe/Widgets/Model/WidgetArea.ss
+++ b/templates/SilverStripe/Widgets/Model/WidgetArea.ss
@@ -1,3 +1,3 @@
-<% loop WidgetControllers %>
+<% loop $WidgetControllers %>
 	$WidgetHolder
-<% end_loop %>
\ No newline at end of file
+<% end_loop %>
diff --git a/templates/WidgetDescription.ss b/templates/WidgetDescription.ss
index e7acc6f..dd4ddef 100644
--- a/templates/WidgetDescription.ss
+++ b/templates/WidgetDescription.ss
@@ -1,5 +1,5 @@
 <div class="Widget" id="$ClassName">
-	<h3 title="<% _t('WidgetDescription_ss.CLICKTOADDWIDGET', 'Click to add this widget') %>">$CMSTitle</h3>
+	<h3 title="<%t WidgetDescription_ss.CLICKTOADDWIDGET 'Click to add this widget' %>">$CMSTitle</h3>
 	<div class="widgetDescription">
 		<p>$Description</p>
 	</div>
diff --git a/templates/WidgetEditor.ss b/templates/WidgetEditor.ss
index d1f2e4c..992b1dd 100644
--- a/templates/WidgetEditor.ss
+++ b/templates/WidgetEditor.ss
@@ -10,5 +10,5 @@
 	<% end_if %>
 	<input type="hidden" name="$Name[Type]" value="$ClassName" />
 	<input type="hidden" name="$Name[Sort]" value="$Sort" />
-	<p class="deleteWidget"><span class="widgetDelete btn btn-danger"><% _t('WidgetEditor_ss.DELETE', 'Delete') %></span></p>
+	<p class="deleteWidget"><span class="widgetDelete btn btn-danger"><%t WidgetEditor_ss.DELETE 'Delete' %></span></p>
 </div>
diff --git a/templates/WidgetHolder.ss b/templates/WidgetHolder.ss
index e6787fd..d923897 100644
--- a/templates/WidgetHolder.ss
+++ b/templates/WidgetHolder.ss
@@ -1,4 +1,4 @@
-<div class="WidgetHolder $ClassName<% if FirstLast %> $FirstLast<% end_if %>">
-	<% if Title %><h3>$Title</h3><% end_if %>
+<div class="WidgetHolder $ClassName<% if $FirstLast %> $FirstLast<% end_if %>">
+	<% if $Title %><h3>$Title</h3><% end_if %>
 	$Content
 </div>