diff --git a/home/graphical/firefox/default.nix b/home/graphical/firefox/default.nix
index 96edd1e..951e20e 100644
--- a/home/graphical/firefox/default.nix
+++ b/home/graphical/firefox/default.nix
@@ -9,77 +9,10 @@ lib.mkIf osConfig.programs.firefox.enable {
   programs.firefox = {
     enable = true;
     # Installed by nixpkgs module
-    package = osConfig.programs.firefox.package;
+    package = null;
     profiles.${config.home.username} = {
       name = config.home.username;
       isDefault = true;
-      userContent = # css
-        ''
-          /* Sidebery */
-          @-moz-document url("moz-extension://d1d9847c-2bad-429f-9366-56db49b8c3d6/sidebar/sidebar.html")
-          {
-            #root {
-              --tabs-indent: 0px !important;
-            }
-
-            #root:hover {
-              --tabs-indent: 30px !important;
-            }
-          }
-        '';
-      userChrome = # css
-        ''
-          /* Hides the native tabs, sidebar header and splitter */
-          #TabsToolbar,
-          #sidebar-splitter,
-          #sidebar-header {
-            display: none;
-          }
-
-          #sidebar-box {
-            --sidebar-normal-width: 35px;
-            --sidebar-hovered-width: 300px;
-            --sidebar-transition-speed: 200ms;
-            --sidebar-collapse-delay: 300ms;
-            --sidebar-transition-type: linear;
-            --browser-area-z-index-sidebar: 3;
-
-            position: relative;
-            min-width: var(--sidebar-normal-width) !important;
-            width: var(--sidebar-normal-width) !important;
-            max-width: var(--sidebar-normal-width) !important;
-            z-index: var(--browser-area-z-index-sidebar);
-          }
-
-          #sidebar-box[positionend] {
-            direction: rtl;
-          }
-          #sidebar-box[positionend] > * {
-            direction: ltr;
-          }
-
-          #sidebar-box[positionend]:-moz-locale-dir(rtl) {
-            direction: ltr;
-          }
-          #sidebar-box[positionend]:-moz-locale-dir(rtl) > * {
-            direction: rtl;
-          }
-
-          #main-window[sizemode="fullscreen"] #sidebar-box {
-            --sidebar-normal-width: 1px;
-          }
-
-          #sidebar {
-            transition: min-width var(--sidebar-transition-speed)
-              var(--sidebar-transition-type) var(--sidebar-collapse-delay) !important;
-            min-width: var(--sidebar-normal-width) !important;
-            will-change: min-width;
-          }
-          #sidebar-box:hover > #sidebar {
-            min-width: var(--sidebar-hovered-width) !important;
-            transition-delay: 100ms !important;
-          }
-        '';
       search = {
         default = "DuckDuckGo";
         force = true;
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index aa7d546..d3a5534 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -10,7 +10,7 @@
 }:
 lib.mkIf config.programs.firefox.enable {
   programs.firefox = {
-    package = pkgs.firefox-esr;
+    package = pkgs.firefox-beta;
     languagePacks = [
       "de"
       "en-GB"
@@ -42,6 +42,7 @@ lib.mkIf config.programs.firefox.enable {
       "browser.newtabpage.activity-stream.showSearch" = false;
       "browser.newtabpage.activity-stream.feeds.topsites" = false;
       "browser.newtabpage.activity-stream.feeds.section.highlights" = false;
+      "browser.tabs.groups.enabled" = true;
       # Add-ons
       "extensions.pocket.enabled" = false;
       "extensions.postDownloadThirdPartyPrompt" = false; # Prompt for install before download
@@ -77,6 +78,8 @@ lib.mkIf config.programs.firefox.enable {
       "privacy.resistFingerprinting.block_mozAddonManager" = true;
       # Allow styling through userChrome.css
       "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+
+      "sidebar.verticalTabs" = true;
     };
     policies = {
       PasswordManagerEnabled = false;