diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.ublock b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
similarity index 57%
rename from profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.ublock
rename to profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
index 54988a10c..d428552d4 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.ublock
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/Preferences.extensions
@@ -9,6 +9,7 @@
             }
         },
         "settings": {
+#?pkg(www-plugins/chrome-ublock)!=#
             "cjpalhdlnbpafiamejdnhcphjbkeiagm": {
                 "active_permissions": {
                     "api": [
@@ -147,16 +148,113 @@
                 "was_installed_by_oem": false,
                 "withholding_permissions": false
             }
-        },
+#pkg#
+#?pkg(www-plugins/chrome-ublock)!=&&pkg(www-plugins/chrome-freedommarks)!=&&ini(user_credentials.nextcloud_url)!=&&ini(user_credentials.nextcloud_login)!=&&ini(user_credentials.nextcloud_pw)!=#
+	    ,
+#pkg#
+#?pkg(www-plugins/chrome-freedommarks)!=&&ini(user_credentials.nextcloud_url)!=&&ini(user_credentials.nextcloud_login)!=&&ini(user_credentials.nextcloud_pw)!=#
+            "gmmpjoepfelkmeedfkfkadgkhholibko": {
+                "active_permissions": {
+                    "api": [
+                        "activeTab",
+                        "storage",
+                        "tabs"
+                    ],
+                    "explicit_host": [
+                        "https://*/*"
+                    ],
+                    "manifest_permissions": []
+                },
+                "commands": {},
+                "content_settings": [],
+                "creation_flags": 9,
+                "events": [],
+                "from_bookmark": false,
+                "from_webstore": true,
+                "granted_permissions": {
+                    "api": [
+                        "activeTab",
+                        "storage",
+                        "tabs"
+                    ],
+                    "explicit_host": [
+                        "https://*/*"
+                    ],
+                    "manifest_permissions": []
+                },
+                "incognito_content_settings": [],
+                "incognito_preferences": {},
+                "location": 1,
+                "manifest": {
+                    "applications": {
+                        "gecko": {
+                            "id": "freedommarks.extension@venturin.net",
+                            "strict_min_version": "48.0"
+                        }
+                    },
+                    "background": {
+                        "scripts": [
+                            "js/background.js"
+                        ]
+                    },
+                    "browser_action": {
+                        "browser_style": true,
+                        "default_icon": "icons/FreedomMarks_dark_32x32.png",
+                        "default_popup": "FreedomMarks.html",
+                        "default_title": "FreedomMarks",
+                        "theme_icons": [
+                            {
+                                "dark": "icons/FreedomMarks_dark_32x32.png",
+                                "light": "icons/FreedomMarks_light_32x32.png",
+                                "size": 32
+                            },
+                            {
+                                "dark": "icons/FreedomMarks_dark_48x48.png",
+                                "light": "icons/FreedomMarks_light_48x48.png",
+                                "size": 48
+                            }
+                        ]
+                    },
+                    "homepage_url": "https://github.com/damko/freedommarks-browser-webextension",
+                    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2YORuM1OGySufoF4W0JZfF9IMHrEscT7TjEDSh+92HlbcG5JIDmY9F8I7rQ3DC900IiwT2hsIaTSbP8+teTFhmgXe2hPSXTBKjcBXkTinPlsk1Lf24UYjMQtxWr/15WlZQ1YUBCQg6bydP3H/4wRxx9WlxTgcvJMgPeQIZ+/VkTi7cyQcwYHIn+Z+tye9Fo6SPrfhdVusEwJY1cSZE/OpkS7fSNg2Lp6MSxrgu0fq/6VEFtW6/Sq2WY8XlI3PqJy2oywdSu+MjGj+HNTG0w6W69+jsKJZmHFmy1mGpm6P9Hys70WLXkF76AjnVqLYn7KC0k6NeRKOC7TLSOQtwVnJQIDAQAB",
+                    "manifest_version": 2,
+                    "name": "FreedomMarks",
+                    "options_ui": {
+                        "page": "FreedomMarks_options.html"
+                    },
+                    "permissions": [
+                        "tabs",
+                        "activeTab",
+                        "storage",
+                        "https://*/*"
+                    ],
+                    "update_url": "https://clients2.google.com/service/update2/crx",
+                    "version": "0.1.2"
+                },
+                "needs_sync": true,
+                "never_activated_since_loaded": true,
+                "path": "gmmpjoepfelkmeedfkfkadgkhholibko/0.1.2_0",
+                "preferences": {},
+                "regular_only_preferences": {},
+                "state": 1,
+                "was_installed_by_default": false,
+                "was_installed_by_oem": false,
+                "withholding_permissions": false
+            }
+#pkg#
+	},
         "toolbar": [
-            "cjpalhdlnbpafiamejdnhcphjbkeiagm"
+            "cjpalhdlnbpafiamejdnhcphjbkeiagm",
+            "hlpjhlifkgmoibhollggngbbhbejecph",
+            "gmmpjoepfelkmeedfkfkadgkhholibko"
         ]
     },
     "protection": {
         "macs": {
             "extensions": {
                 "settings": {
-                    "cjpalhdlnbpafiamejdnhcphjbkeiagm": "4013706C949FD89AD1F588F32A08A9656D83C0A61DB56C141341E60CF4404C95"
+                    "cjpalhdlnbpafiamejdnhcphjbkeiagm": "4013706C949FD89AD1F588F32A08A9656D83C0A61DB56C141341E60CF4404C95",
+                    "gmmpjoepfelkmeedfkfkadgkhholibko": "C253FB70BF73E16A7589C63B4D16FF1A4CE1D498FE35271E18A47DD5074E1DF7"
                 }
             }
         }
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-freedommarks.sh b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-freedommarks.sh
new file mode 100644
index 000000000..6b18e3b9c
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-freedommarks.sh
@@ -0,0 +1,16 @@
+# Calculate pkg(www-plugins/chrome-freedommarks)!=&&ini(user_credentials.nextcloud_url)!=&&ini(user_credentials.nextcloud_login)!=&&ini(user_credentials.nextcloud_pw)!= exec=/bin/bash
+
+plugin_id="gmmpjoepfelkmeedfkfkadgkhholibko"
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
+mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
+cp -r /usr/share/chrome-freedommarks/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
+
+/usr/share/chrome-freedommarks/configure.py #-ur_home_path-#/.config/chromium $plugin_id <<EOF
+{
+    "freedommarks_settings": "{\"bookmark_main_tab\":false,\"password\":\"#-ini(user_credentials.nextcloud_pw)-#\",\"search_main_tab\":true,\"server_url\":\"#-ini(user_credentials.nextcloud_url)-#\",\"username\":\"#-ini(user_credentials.nextcloud_login)-#\"}"
+}
+EOF
+
+chown #-ur_login-#:#-ur_group-# -R #-ur_home_path-#/.config/chromium/Default/Extensions
+chown #-ur_login-#:#-ur_group-# -R "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
+exit 0
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-ublock.sh b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-ublock.sh
index 7ed398eb2..fb7243cee 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-ublock.sh
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/install-ublock.sh
@@ -1,7 +1,7 @@
 # Calculate pkg(www-plugins/chrome-ublock)!= exec=/bin/bash
 
 plugin_id="cjpalhdlnbpafiamejdnhcphjbkeiagm"
-mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/cjpalhdlnbpafiamejdnhcphjbkeiagm
+mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
 mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings"
 cp -r /usr/share/chrome-ublock/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
 
diff --git a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
index 0e13dc113..36b7e82ef 100644
--- a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
+++ b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
@@ -18,7 +18,8 @@ KEYWORDS="amd64 x86"
 DEPEND="|| ( www-client/chromium
 	www-client/google-chrome )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	dev-python/plyvel"
 
 S="${WORKDIR}"
 
@@ -26,4 +27,6 @@ src_install() {
 	dodir /usr/share/${PN}
 	insinto /usr/share/${PN}
 	doins -r *
+	doins ${FILESDIR}/configure.py
+	fperms 755 /usr/share/$PN/configure.py
 }
diff --git a/www-plugins/chrome-freedommarks/files/configure.py b/www-plugins/chrome-freedommarks/files/configure.py
new file mode 100644
index 000000000..2074c4312
--- /dev/null
+++ b/www-plugins/chrome-freedommarks/files/configure.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python3
+
+import plyvel
+import json
+import sys
+from os import path
+
+data = json.load(sys.stdin)
+
+if len(sys.argv) < 3:
+    sys.stderr.write("configure-ublock.py chrome-dir ext-id")
+    sys.exit(1)
+
+chrome_dir = sys.argv[1]
+ext_id = sys.argv[2]
+
+db_path = path.join(chrome_dir,"Default/Local Extension Settings", ext_id)
+db = plyvel.DB(db_path, create_if_missing=True)
+for k,v in data.items():
+    db.put(bytes(k,encoding='utf-8'), bytes(v,encoding='utf-8'))
+db.close()