diff --git a/NinjaKit.safariextension/js/options.js b/NinjaKit.safariextension/js/options.js
index e5de76b..44021f5 100644
--- a/NinjaKit.safariextension/js/options.js
+++ b/NinjaKit.safariextension/js/options.js
@@ -109,6 +109,30 @@ function init(){
     FontList();
   }
 
+  initializeOption('tabsize', 'tabSize', 1);
+  initializeOption('braces-on-own-line', 'bracesOnOwnLine', true);
+  initializeOption('preserve-newlines', 'preserveNewlines', true);
+  initializeOption('detect-packers', 'detectPackers', false);
+  initializeOption('keep-array-indentation', 'keepArrayIndentation', false);
+
+  function initializeOption(id, optionKey, defaultValue) {
+    var currentValue, key,
+        element = document.getElementById(id);
+    if (element.tagName == "INPUT" && element.type == "checkbox") {
+      currentValue = Config.options[optionKey] === undefined ? defaultValue : Config.options[optionKey];
+      key = "checked";
+      element.checked = currentValue ? true : false;
+    } else {
+      currentValue = +Config.options[optionKey] || defaultValue;
+      key = "value";
+      element.value = currentValue;
+    }
+    element.onclick = function() {
+      Config.options[optionKey] = element[key];
+      localStorage.Config = JSON.stringify(Config);
+    }
+  }
+
   var add = document.getElementById('add_script');
   var add_script = function(){
     var styl = {
diff --git a/NinjaKit.safariextension/options.html b/NinjaKit.safariextension/options.html
index 3cecba8..a47c80c 100644
--- a/NinjaKit.safariextension/options.html
+++ b/NinjaKit.safariextension/options.html
@@ -30,15 +30,15 @@ <h2>beautify options</h2>
       <ul>
         <li>
           <select name="tabsize" id="tabsize">
-            <option value="1" selected="selected">indent with a tab character</option>
+            <option value="1">indent with a tab character</option>
             <option value="2">indent with 2 spaces</option>
             <option value="3">indent with 3 spaces</option>
             <option value="4">indent with 4 spaces</option>
             <option value="8">indent with 8 spaces</option>
           </select>
         </li>
-        <li><input type="checkbox" id="braces-on-own-line" checked="checked"><label for="braces-on-own-line"> Braces on own line</label></li>
-        <li><input type="checkbox" id="preserve-newlines" checked="checked"><label for="preserve-newlines"> Preserve empty lines?</label></li>
+        <li><input type="checkbox" id="braces-on-own-line"><label for="braces-on-own-line"> Braces on own line</label></li>
+        <li><input type="checkbox" id="preserve-newlines"><label for="preserve-newlines"> Preserve empty lines?</label></li>
         <li><input type="checkbox" id="detect-packers"><label for="detect-packers"> Detect packers?</label></li>
         <li><input type="checkbox" id="keep-array-indentation"><label for="keep-array-indentation"> Keep array indentation?</label></li>
         <li> Font size: <span id="currentFontSize">12</span><br> 8<input type="range" id="fontSize" value="12" step="1" min="8" max="40">40</li>