diff --git a/components/install/process.php b/components/install/process.php
index 74fe6bd..2258b77 100644
--- a/components/install/process.php
+++ b/components/install/process.php
@@ -209,7 +209,7 @@ define("WORKSPACE", BASE_PATH . "/workspace");
 define("WSURL", BASE_URL . "/workspace");
 
 // Plugin Market
-define("PMURL", "http://codiad.com/plugins.json");
+//define("PMURL", "http://codiad.com/plugins.json");
 
 // Theme Market
 //define("TMURL", "http://codiad.com/themes.json");
diff --git a/components/plugin_manager/dialog.php b/components/plugin_manager/dialog.php
index 7194b59..41d1ab1 100644
--- a/components/plugin_manager/dialog.php
+++ b/components/plugin_manager/dialog.php
@@ -27,14 +27,14 @@
             $pm = new Plugin_manager();
             $market = $pm->Market();
             ?>
-            <label>Plugin Market</label>
+            <label><?php i18n("Plugin Market"); ?></label>
             <div id="plugin-list">
             <table width="100%">
                 <tr>
-                    <th>Plugin Name</th>
-                    <th>Description</th>
-                    <th>Author</th>
-                    <th>Download</th>
+                    <th><?php i18n("Plugin Name"); ?></th>
+                    <th><?php i18n("Description"); ?></th>
+                    <th><?php i18n("Author"); ?></th>
+                    <th><?php i18n("Download"); ?></th>
                 </tr>
             <?php
             if($market != '') {
@@ -97,14 +97,14 @@
                 }
             } else {
                 ?>
-                <tr><td colspan="4">Plugin Market currently unavailable.</td></tr>
+                <tr><td colspan="4"><?php i18n("Plugin Market currently unavailable."); ?></td></tr>
                 <?php
             }
             
             ?>
             </table>
             </div>
-            <button class="btn-left" onclick="codiad.plugin_manager.list();return false;">Installed Plugins</button><button class="btn-mid" onclick="codiad.plugin_manager.check();return false;">Update Check</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Close</button>
+            <button class="btn-left" onclick="codiad.plugin_manager.list();return false;"><?php i18n("Installed Plugins"); ?></button><button class="btn-mid" onclick="codiad.plugin_manager.check();return false;"><?php i18n("Update Check"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             
             break;
@@ -186,11 +186,11 @@
             
             if($plugincount == 0) {
             ?>
-            <tr><td colspan="<?php echo $colspan;?>">No Plugins installed. Check Plugin Market.</td></tr>
+            <tr><td colspan="<?php echo $colspan;?>"><?php i18n("No Plugins installed. Check Plugin Market."); ?></td></tr>
             <?php
             } else {
             ?>
-            <tr><td colspan="<?php echo $colspan;?>" align="right"><?php echo $plugincount; ?> Plugins installed.</td></tr>
+            <tr><td colspan="<?php echo $colspan;?>" align="right"><?php echo $plugincount; ?> <?php i18n("Plugins installed."); ?></td></tr>
             <?php
             }
             
@@ -273,7 +273,7 @@
                                         }
                                     } else {
                                         ?>
-                                            <td><font style="color:green">Latest</font></td>
+                                            <td><font style="color:green"><?php i18n("Latest"); ?></font></td>
                                         <?php
                                     }
                                 } else {
@@ -292,7 +292,7 @@
             
             if($plugincount == 0) {
             ?>
-            <tr><td colspan="4">No Plugins installed. Check Plugin Market.</td></tr>
+            <tr><td colspan="4"><?php i18n("No Plugins installed. Check Plugin Market."); ?></td></tr>
             <?php
             }             
             ?>
diff --git a/components/theme_manager/class.theme_manager.php b/components/theme_manager/class.theme_manager.php
index a5322f7..71d9b09 100644
--- a/components/theme_manager/class.theme_manager.php
+++ b/components/theme_manager/class.theme_manager.php
@@ -150,8 +150,8 @@ class Theme_manager extends Common {
             }
         }
 
-        if(file_exists(THEMES.'/'.$name.'/plugin.json')) {
-            $data = json_decode(file_get_contents(THEMES.'/'.$name.'/plugin.json'),true);
+        if(file_exists(THEMES.'/'.$name.'/theme.json')) {
+            $data = json_decode(file_get_contents(THEMES.'/'.$name.'/theme.json'),true);
             if(substr($data[0]['url'],-4) == '.git') {
                 $data[0]['url'] = substr($data[0]['url'],0,-4);
             }
diff --git a/components/theme_manager/dialog.php b/components/theme_manager/dialog.php
index b6c9431..a93d7ad 100644
--- a/components/theme_manager/dialog.php
+++ b/components/theme_manager/dialog.php
@@ -27,14 +27,14 @@
             $tm = new Theme_manager();
             $market = $tm->Market();
             ?>
-            <label>Theme Market</label>
+            <label><?php i18n("Theme Market"); ?></label>
             <div id="theme-list">
             <table width="100%">
                 <tr>
-                    <th>Theme Name</th>
-                    <th>Description</th>
-                    <th>Author</th>
-                    <th>Download</th>
+                    <th><?php i18n("Theme Name"); ?></th>
+                    <th><?php i18n("Description"); ?></th>
+                    <th><?php i18n("Author"); ?></th>
+                    <th><?php i18n("Download"); ?></th>
                 </tr>
             <?php
             if($market != '') {
@@ -97,14 +97,14 @@
                 }
             } else {
                 ?>
-                <tr><td colspan="4">Theme Market currently unavailable.</td></tr>
+                <tr><td colspan="4"><?php i18n("Theme Market currently unavailable."); ?></td></tr>
                 <?php
             }
             
             ?>
             </table>
             </div>
-            <button class="btn-left" onclick="codiad.theme_manager.list();return false;">Installed Themes</button><button class="btn-mid" onclick="codiad.theme_manager.check();return false;">Update Check</button><button class="btn-right" onclick="codiad.modal.unload();return false;">Close</button>
+            <button class="btn-left" onclick="codiad.theme_manager.list();return false;"><?php i18n("Installed Themes"); ?></button><button class="btn-mid" onclick="codiad.theme_manager.check();return false;"><?php i18n("Update Check"); ?></button><button class="btn-right" onclick="codiad.modal.unload();return false;"><?php i18n("Close"); ?></button>
             <?php
             
             break;
@@ -186,11 +186,11 @@
             
             if($themecount == 0) {
             ?>
-            <tr><td colspan="<?php echo $colspan;?>">No Themes installed. Check Theme Market.</td></tr>
+            <tr><td colspan="<?php echo $colspan;?>"><?php i18n("No Themes installed. Check Theme Market."); ?></td></tr>
             <?php
             } else {
             ?>
-            <tr><td colspan="<?php echo $colspan;?>" align="right"><?php echo $themecount; ?> Themes installed.</td></tr>
+            <tr><td colspan="<?php echo $colspan;?>" align="right"><?php echo $themecount; ?> <?php i18n("Themes installed."); ?></td></tr>
             <?php
             }
             
@@ -273,7 +273,7 @@
                                         }
                                     } else {
                                         ?>
-                                            <td><font style="color:green">Latest</font></td>
+                                            <td><font style="color:green"><?php i18n("Latest"); ?></font></td>
                                         <?php
                                     }
                                 } else {
@@ -292,7 +292,7 @@
             
             if($themecount == 0) {
             ?>
-            <tr><td colspan="4">No Themes installed. Check Themes Market.</td></tr>
+            <tr><td colspan="4"><?php i18n("No Themes installed. Check Themes Market."); ?></td></tr>
             <?php
             }             
             ?>