3 files changed, 7 insertions, 2 deletions
diff --git a/files/usr/local/lib/firefox/distribution/policies.json.common b/files/usr/local/lib/firefox/distribution/policies.json.desktop
index 425a6d6..de93355 100644
--- a/files/usr/local/lib/firefox/distribution/policies.json.common
+++ b/files/usr/local/lib/firefox/distribution/policies.json.desktop
@@ -22,7 +22,7 @@
       "Extensions": {
         "uBlock0@raymondhill.net": {
           "toOverwrite": {
-            "filterLists": [
+            "selectedFilterLists": [
               "user-filters",
               "ublock-filters",
               "ublock-badware",
@@ -30,11 +30,14 @@
               "ublock-abuse",
               "ublock-unbreak",
               "ublock-annoyances",
+              "ublock-cookies-easylist",
+              "fanboy-cookiemonster",
               "easylist",
               "easyprivacy",
               "urlhaus-1",
               "plowe-0",
               "fanboy-annoyance",
+              "fanboy-social",
               "fanboy-thirdparty_social",
               "adguard-spyware-url",
               "ublock-quick-fixes"
@@ -42,7 +45,7 @@
           },
           "toAdd": {
             "trustedSiteDirectives": [
-              "${domain}"
+              "$(join '","' "$domain" $ublock_whitelist)"
             ]
           }
         }
diff --git a/files/usr/local/lib/firefox/distribution/policies.json.laptop b/files/usr/local/lib/firefox/distribution/policies.json.laptop
new file mode 120000
index 0000000..93bcb92
--- /dev/null
+++ b/files/usr/local/lib/firefox/distribution/policies.json.laptop
@@ -0,0 +1 @@
+policies.json.desktop
+\ No newline at end of file
diff --git a/files/usr/local/lib/firefox/distribution/policies.json.roadwarrior_laptop b/files/usr/local/lib/firefox/distribution/policies.json.roadwarrior_laptop
new file mode 120000
index 0000000..93bcb92
--- /dev/null
+++ b/files/usr/local/lib/firefox/distribution/policies.json.roadwarrior_laptop
@@ -0,0 +1 @@
+policies.json.desktop
+\ No newline at end of file