diff --git a/ReadMe.md b/ReadMe.md
index f7099b3..b6db683 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -6,18 +6,18 @@ For FAQs and instruction on how to use the extension please visit http://firefox
 
 ## Downloads:
 Production version can be found at https://addons.mozilla.org/en-US/firefox/addon/privacy-settings/
-Developer version can be found at https://github.com/schomery/privacy-settings/blob/master/builds/packed/firefox.xpi?raw=true
+Developer version can be found at https://github.com/schomery/privacy-settings/tree/master/builds
 
 ## How to build from source code
 If you have modified the source code and want to see the modified version in action, you can simply compile the project yourself. Run the following command in the terminal
 ```bash
-gulp firefox
+cd src
+jpm xpi
 ```
+This will generate an `XPI` file for you in the src directory. Drop the file in your Firefox browser
 Notes:
 
-1. The compiler is based on [nodejs](https://nodejs.org/en/) and [gulp](http://gulpjs.com/)
-2. You also need to have these modules available, https://github.com/schomery/privacy-settings/blob/master/gulpfile.js#L3-L14
-
+1. To build this project you need to have [nodejs](https://nodejs.org/en/) installed. Also make sure `jpm` module is also globally available; [https://www.npmjs.com/package/jpm](https://www.npmjs.com/package/jpm)
 
 ## Technical notes:
 #### Temporary Locking a Preference
diff --git a/src/data/advanced-settings/index.html b/src/data/advanced-settings/index.html
index 21bc717..4dfc33f 100644
--- a/src/data/advanced-settings/index.html
+++ b/src/data/advanced-settings/index.html
@@ -45,7 +45,8 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>browser.safebrowsing.<b>downloads</b>.enabled</span>
-        <label>prv</label>
+        <label>prvcy</label>
+        <label>scrty</label>
         <spacer></spacer>
         <input type="checkbox" name="browser.safebrowsing.downloads.enabled">
         <span type="checkbox"></span>
@@ -57,7 +58,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.http.send<b>Referer</b>Header</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="range" name="network.http.sendRefererHeader" min="0" max="2">
         <span type="range"></span>
@@ -69,7 +70,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.http.<b>referer</b>.XOriginPolicy</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="range" name="network.http.referer.XOriginPolicy" min="0" max="2">
         <span type="range"></span>
@@ -81,7 +82,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.http.<b>referer</b>.trimmingPolicy</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="range" name="network.http.referer.trimmingPolicy" min="0" max="2">
         <span type="range"></span>
@@ -93,7 +94,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.http.<b>referer</b>.spoofSource</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="network.http.referer.spoofSource">
         <span type="checkbox"></span>
@@ -105,7 +106,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.predictor.enabled</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="network.predictor.enabled">
         <span type="checkbox"></span>
@@ -117,7 +118,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.http.speculative-parallel-limit</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <input type="number" name="network.http.speculative-parallel-limit">
         <input type="button" data-cmd="reset" value="Reset">
       </div>
@@ -128,7 +129,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.<b>cookie</b>.cookieBehavior</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="range" name="network.cookie.cookieBehavior" min="0" max="3">
         <span type="range"></span>
@@ -140,7 +141,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.<b>cookie</b>.lifetimePolicy</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="range" name="network.cookie.lifetimePolicy" min="0" max="3">
         <span type="range"></span>
@@ -152,7 +153,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>network.<b>cookie</b>.thirdparty.sessionOnly</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="network.cookie.thirdparty.sessionOnly">
         <span type="checkbox"></span>
@@ -164,7 +165,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>browser.<b>search</b>.suggest.enabled</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="browser.search.suggest.enabled">
         <span type="checkbox"></span>
@@ -176,7 +177,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span><b>clipboard</b>.autocopy</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="clipboard.autocopy">
         <span type="checkbox"></span>
@@ -188,7 +189,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span>loop.<b>facebook</b>.shareUrl</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <input type="text" name="loop.facebook.shareUrl">
         <input type="button" data-cmd="reset" value="Reset">
       </div>
@@ -198,7 +199,7 @@ <h1 data-l10n-id="avdsttngs.title">Advanced Settings :: Privacy Settings</h1>
     <div class="v-flex">
       <div class="h-flex">
         <span><b>loop</b>.logDomains</span>
-        <label>prv</label>
+        <label>prvcy</label>
         <spacer></spacer>
         <input type="checkbox" name="loop.logDomains">
         <span type="checkbox"></span>