From e0cc524e32b1fd511b79d408472dd3017fd2c82a Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Sat, 1 Jun 2013 06:17:25 -0700
Subject: [PATCH] bugfixes

---
 builds/appchan-x.js        | 8 ++++----
 builds/appchan-x.user.js   | 8 ++++----
 builds/crx/script.js       | 8 ++++----
 src/Theming/Mascots.coffee | 4 ++--
 src/Theming/Style.coffee   | 2 +-
 src/Theming/Themes.coffee  | 2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/builds/appchan-x.js b/builds/appchan-x.js
index 244d50c31..2254de9bc 100644
--- a/builds/appchan-x.js
+++ b/builds/appchan-x.js
@@ -11188,7 +11188,7 @@
       editMascot = {};
       $.rm($.id('mascotConf'));
       Style.addStyle();
-      return Settings.open("mascots");
+      return Settings.open("Mascots");
     },
     importMascot: function(evt) {
       var file, reader;
@@ -11225,7 +11225,7 @@
         });
         alert("Mascot \"" + name + "\" imported!");
         $.rm($("#mascotContainer", d.body));
-        return Settings.open('mascots');
+        return Settings.open('Mascots');
       };
       return reader.readAsText(file);
     }
@@ -11498,7 +11498,7 @@
     },
     addStyle: function(theme) {
       if (!theme) {
-        theme = Themes[_conf['theme']] || Themes['Yotsuba B'];
+        theme = Themes[Conf['theme']] || Themes['Yotsuba B'];
       }
       Style.dynamicCSS.textContent = Style.dynamic();
       Style.iconPositions();
@@ -11980,7 +11980,7 @@
       Conf['editMode'] = false;
       $.rm($.id('themeConf'));
       Style.addStyle();
-      return Settings.open('themes');
+      return Settings.open('Themes');
     }
   };
 
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index e8cda1fb4..ee3feb354 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -11182,7 +11182,7 @@
       editMascot = {};
       $.rm($.id('mascotConf'));
       Style.addStyle();
-      return Settings.open("mascots");
+      return Settings.open("Mascots");
     },
     importMascot: function(evt) {
       var file, reader;
@@ -11219,7 +11219,7 @@
         });
         alert("Mascot \"" + name + "\" imported!");
         $.rm($("#mascotContainer", d.body));
-        return Settings.open('mascots');
+        return Settings.open('Mascots');
       };
       return reader.readAsText(file);
     }
@@ -11492,7 +11492,7 @@
     },
     addStyle: function(theme) {
       if (!theme) {
-        theme = Themes[_conf['theme']] || Themes['Yotsuba B'];
+        theme = Themes[Conf['theme']] || Themes['Yotsuba B'];
       }
       Style.dynamicCSS.textContent = Style.dynamic();
       Style.iconPositions();
@@ -11974,7 +11974,7 @@
       Conf['editMode'] = false;
       $.rm($.id('themeConf'));
       Style.addStyle();
-      return Settings.open('themes');
+      return Settings.open('Themes');
     }
   };
 
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 68b01a20a..b631d5a1f 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -11165,7 +11165,7 @@
       editMascot = {};
       $.rm($.id('mascotConf'));
       Style.addStyle();
-      return Settings.open("mascots");
+      return Settings.open("Mascots");
     },
     importMascot: function(evt) {
       var file, reader;
@@ -11202,7 +11202,7 @@
         });
         alert("Mascot \"" + name + "\" imported!");
         $.rm($("#mascotContainer", d.body));
-        return Settings.open('mascots');
+        return Settings.open('Mascots');
       };
       return reader.readAsText(file);
     }
@@ -11476,7 +11476,7 @@
     },
     addStyle: function(theme) {
       if (!theme) {
-        theme = Themes[_conf['theme']] || Themes['Yotsuba B'];
+        theme = Themes[Conf['theme']] || Themes['Yotsuba B'];
       }
       Style.dynamicCSS.textContent = Style.dynamic();
       Style.iconPositions();
@@ -11958,7 +11958,7 @@
       Conf['editMode'] = false;
       $.rm($.id('themeConf'));
       Style.addStyle();
-      return Settings.open('themes');
+      return Settings.open('Themes');
     }
   };
 
diff --git a/src/Theming/Mascots.coffee b/src/Theming/Mascots.coffee
index 52b67a782..a74f69302 100644
--- a/src/Theming/Mascots.coffee
+++ b/src/Theming/Mascots.coffee
@@ -303,7 +303,7 @@ MascotTools =
     editMascot = {}
     $.rm $.id 'mascotConf'
     Style.addStyle()
-    Settings.open "mascots"
+    Settings.open "Mascots"
 
   importMascot: (evt) ->
     file = evt.target.files[0]
@@ -336,6 +336,6 @@ MascotTools =
 
       alert "Mascot \"#{name}\" imported!"
       $.rm $("#mascotContainer", d.body)
-      Settings.open 'mascots'
+      Settings.open 'Mascots'
 
     reader.readAsText(file)
\ No newline at end of file
diff --git a/src/Theming/Style.coffee b/src/Theming/Style.coffee
index e7b8f372d..93505d7a8 100644
--- a/src/Theming/Style.coffee
+++ b/src/Theming/Style.coffee
@@ -120,7 +120,7 @@ Style =
 
   addStyle: (theme) ->
     unless theme
-      theme = Themes[_conf['theme']] or Themes['Yotsuba B']
+      theme = Themes[Conf['theme']] or Themes['Yotsuba B']
 
     Style.dynamicCSS.textContent = Style.dynamic()
     Style.iconPositions()
diff --git a/src/Theming/Themes.coffee b/src/Theming/Themes.coffee
index 8a742cc26..e36854b1f 100644
--- a/src/Theming/Themes.coffee
+++ b/src/Theming/Themes.coffee
@@ -352,4 +352,4 @@ ThemeTools =
     Conf['editMode'] = false
     $.rm $.id 'themeConf'
     Style.addStyle()
-    Settings.open 'themes'
\ No newline at end of file
+    Settings.open 'Themes'
\ No newline at end of file