diff --git a/Booty.i18n.php b/Booty.i18n.magic.php
similarity index 56%
rename from Booty.i18n.php
rename to Booty.i18n.magic.php
index b4d333b..ec2d981 100644
--- a/Booty.i18n.php
+++ b/Booty.i18n.magic.php
@@ -5,15 +5,10 @@
  * @file
  * @ingroup Extensions
  */
-$messages = array();
- 
-/** English
- * @author Andru Vallance
- */
-$messages[ 'en' ] = array(
-  'herounit' => "Hero Unit"
-);
 
+$magicWords = array();
+
+/** English (English) */
 $magicWords['en'] = array(
 	'herounit' => array( 1, 'herounit' ),
 );
diff --git a/Booty.php b/Booty.php
index cba93d2..0a02eff 100644
--- a/Booty.php
+++ b/Booty.php
@@ -8,20 +8,22 @@
  * @License: GPLv2 (http://www.gnu.org/copyleft/gpl.html)
  */
 
-
 $GLOBALS['wgExtensionCredits']['parserhook'][] = array(
 	'name' => 'Booty',
+	'namemsg' => 'skinname-booty'
 	'author' => 'Andru Vallance',
-	'description' => 'Booty is a modern mobile-first responsive MediaWiki theme built on Bootstrap 3. Designed primarily for ease of customisation to create new skins, but with an initial set of clean templates which can be used as-is.  Using [[Extension:Skinny]] allows defining skin variations and options on a per-page basis for awesome skin customisation.',
+	'descriptionmsg' => 'booty-desc'
 	'url' => 'https://github.com/andru/booty'
 );
+
 $cd = dirname(__FILE__);
 
 $GLOBALS['wgAutoloadClasses']['Booty'] = $cd . '/Booty.class.php';
 $GLOBALS['wgAutoloadClasses']['SkinBooty'] = $cd . '/base/Skin.php';
 $GLOBALS['wgAutoloadClasses']['BootyTemplate'] = $cd . '/base/Template.php';
 
-$GLOBALS['wgExtensionMessagesFiles'][ 'Booty' ] = $cd . '/Booty.i18n.php';
+$GLOBALS['wgMessagesDirs']['Booty'] = __DIR__ . '/i18n';
+$GLOBALS['wgExtensionMessagesFiles']['BootyMagic'] = __DIR__ . '/Booty.i18n.magic.php';
 
 $GLOBALS['wgValidSkinNames']['booty'] = 'Booty';
 
@@ -42,4 +44,4 @@
 
 	Booty::init();
 
-};
\ No newline at end of file
+};
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 0000000..6e18f75
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,10 @@
+{
+	"@metadata": {
+		"authors": [
+			"Andru Vallance"
+		]
+	},
+	"skinname-booty ": "Booty",
+	"booty-desc": "Booty is a modern mobile-first responsive MediaWiki theme built on Bootstrap 3. Designed primarily for ease of customisation to create new skins, but with an initial set of clean templates which can be used as-is.  Using [[Extension:Skinny]] allows defining skin variations and options on a per-page basis for awesome skin customisation.",
+	"herounit": "Hero Unit"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 0000000..3565428
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,7 @@
+{
+	"@metadata": {
+		"authors": []
+	},
+	"skinname-booty": "{{optional}}",
+	"booty-desc": "{{desc|what=skin|name=Booty|url=https://www.mediawiki.org/wiki/Skin:Booty}}"
+}