diff --git a/config/distribution/policies.json b/config/distribution/policies.json
index 4baf6de..a39f51b 100644
--- a/config/distribution/policies.json
+++ b/config/distribution/policies.json
@@ -1,37 +1,141 @@
 {
-  "policies": {
-    "DontCheckDefaultBrowser": true,
-    "Camera_BlockNewRequests": true,
-    "Camera_Locked": true,
-    "Microphone_BlockNewRequests": true,
-    "Microphone_Locked": true,
-    "Location_BlockNewRequests": true,
-    "Location_Locked": true,
-    "Notifications_BlockNewRequests": true,
-    "Notifications_Locked": true,
-    "Cookies_AcceptThirdParty": false,
-    "OfferToSaveLogins": false,
-    "OverridePostUpdatePage": "",
-    "DisableMasterPasswordCreation": true,
-    "DisableFeedbackCommands": true,
-    "DisableFeedbackCommands_Explain": true,
-    "DisableFirefoxAccounts": true,
-    "DisableFirefoxAccounts_Explain": true,
-    "DisableFirefoxScreenshots": true,
-    "DisableFirefoxScreenshots_Explain": true,
-    "DisableFirefoxStudies": true,
-    "DisableFirefoxStudies_Explain": true,
-    "DisablePocket": true,
-    "DisablePocket_Explain": true,
-    "DisableProfileImport": true,
-    "DisableProfileImport_Explain": true,
+	"policies": {
+
+    "AppUpdateURL": "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml",
+
+    "CaptivePortal": false,
+
+    "Certificates": {
+      "ImportEnterpriseRoots": false
+    },
+
+    "Cookies": {
+      "Allow": ["http://example.org/"],
+      "Block": ["http://example.edu/"],
+      "Default": true,
+      "ExpireAtSessionEnd": false,
+      "Locked": false
+    },
+
     "DisableSetDesktopBackground": true,
+
+    "DisableMasterPasswordCreation": true,
+
+    "DisableFeedbackCommands": true,
+
+    "DisableFirefoxScreenshots": true,
+
+    "DisableFirefoxAccounts": true,
+
+    "DisableFirefoxStudies": true,
+
+    "DisablePocket": true,
+
+    "DisableProfileImport": true,
+
+    "DisableProfileRefresh": true,
+
+    "DisableSecurityBypass": {
+      "InvalidCertificate": true,
+      "SafeBrowsing": true
+    },
+
     "DisableSystemAddonUpdate": true,
-    "DisableSystemAddonUpdate_Explain": true,
+
     "DisableTelemetry": true,
-    "DisableTelemetry_Explain": true,
-    "TrackingProtection": false,
-    "TrackingProtectionLocked": true,
-    "SSLVersionMin_Explain": "TLS1_2"
-  }
+
+    "DontCheckDefaultBrowser": true,
+
+    "EnableTrackingProtection": {
+      "Value": false,
+      "Locked": true
+    },
+
+    "Extensions": {
+      "Install_remove_me": ["https://addons.mozilla.org/firefox/downloads/latest/example_0-ublock-origin/latest.xpi", "//path/to/xpi"],
+      "Uninstall": ["bad_addon_id@mozilla.org", "twitter@search.mozilla.org"],
+      "Locked":  ["addon_id@mozilla.org"]
+    },
+
+    "FlashPlugin": {
+      "Allow": ["http://example.org/"],
+      "Block": ["http://example.edu/"],
+      "Default": false,
+      "Locked": false
+    },
+
+    "FirefoxHome": {
+      "Search": false,
+      "TopSites": false,
+      "Highlights": false,
+      "Pocket": false,
+      "Snippets": false,
+      "Locked": true
+    },
+
+    "Homepage": {
+      "URL": "about:blank",
+      "Locked": true,
+      "Additional": ["http://example.org/",
+                     "http://example.edu/"],
+      "StartPage": "none"
+    },
+
+    "NewTabPage": false,
+
+    "NetworkPrediction": false,
+
+    "NoDefaultBookmarks": true,
+
+    "OfferToSaveLogins": false,
+
+    "OverrideFirstRunPage": "",
+
+    "OverridePostUpdatePage": "",
+
+    "Permissions": {
+      "Camera": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"],
+        "BlockNewRequests": true,
+        "Locked": true
+      },
+      "Microphone": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"],
+        "BlockNewRequests": true,
+        "Locked": true
+      },
+      "Location": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"],
+        "BlockNewRequests": true,
+        "Locked": true
+      },
+      "Notifications": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"],
+        "BlockNewRequests": true,
+        "Locked": true
+      }
+    },
+
+    "PopupBlocking": {
+      "Allow": ["http://example.org/",
+                "http://example.edu/"],
+      "Default": true,
+      "Locked": true
+    },
+
+    "SearchEngines": {
+	    	"Default": "DuckDuckGo",
+	    	"PreventInstalls": false,
+	    	"Remove": ["Bing", "Google", "Twitter"]
+    },
+
+    "SearchSuggestEnabled": false,
+
+    "SSLVersionMin": "tls1.2"
+
+	}
 }
\ No newline at end of file