diff --git a/modules/applications.nix b/modules/applications.nix
index 58e2afe..8f0237f 100644
--- a/modules/applications.nix
+++ b/modules/applications.nix
@@ -78,7 +78,6 @@ with import ../support.nix { inherit lib config; }; {
         "x-scheme-handler/https" = browser;
         "x-scheme-handler/about" = browser;
         "x-scheme-handler/unknown" = browser;
-        "x-scheme-handler/viewtube" = viewtube;
         # "x-scheme-handler/mailto" = mail;
         # "application/pdf" = { desktop = "org.kde.okular"; };
         # "application/vnd.openxmlformats-officedocument.wordprocessingml.document" =
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 964a230..fc89492 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -1,4 +1,8 @@
-{ pkgs, config, lib, ... }: {
+{ pkgs, config, lib, ... }:
+with rec {
+  inherit (config) deviceSpecific;
+};
+with deviceSpecific; {
   # programs.adb.enable = true;
 
   environment.systemPackages = with pkgs; [
@@ -19,7 +23,7 @@
     libva-utils
     lm_sensors
     libnotify
-    youtube-to-mpv
+    (youtube-to-mpv.override { isLaptop = isLaptop; })
     # Other
     (vivaldi.override { proprietaryCodecs = true; })
     wget
@@ -32,7 +36,7 @@
     tdesktop
     spotifywm
     youtube-dl
-  ] ++ lib.optionals config.deviceSpecific.isLaptop [
+  ] ++ lib.optionals isLaptop [
     # Important
     acpi
     light
diff --git a/modules/applications/youtube-to-mpv.nix b/modules/applications/youtube-to-mpv.nix
index 2225d39..eb39779 100644
--- a/modules/applications/youtube-to-mpv.nix
+++ b/modules/applications/youtube-to-mpv.nix
@@ -1,7 +1,7 @@
 
-{ stdenv, pkgs }:
+{ stdenv, pkgs, isLaptop ? false }:
 let
-  myScript = if config.deviceSpecific.isLaptop then
+  myScript = if isLaptop then
     pkgs.writeShellScriptBin "yt-mpv" ''
       BATTERY="`${pkgs.acpi}/bin/acpi -b | grep --invert-match unavailable | head -1`"
       STATUS=`awk -F'[,:] ' '{print $2}' <<< "$BATTERY"`
diff --git a/modules/power.nix b/modules/power.nix
index 4240bf4..54b88ac 100644
--- a/modules/power.nix
+++ b/modules/power.nix
@@ -9,11 +9,18 @@ with deviceSpecific; {
     extraConfig = ''
       # To avoid filesystem corruption on btrfs formatted partitions
       SATA_LINKPWR_ON_BAT=max_performance
+      # Recommended
+      CPU_SCALING_GOVERNOR_ON_AC=powersave
+      CPU_SCALING_GOVERNOR_ON_BAT=powersave
+      CPU_HWP_ON_AC=balance_performance
+      CPU_HWP_ON_BAT=balance_power
+      CPU_BOOST_ON_AC=1
+      CPU_BOOST_ON_BAT=0
     '';
   };
   services.undervolt = {
     enable = (device == "Dell-Laptop");
     coreOffset = "-120";
     gpuOffset = "-54";
-  }
+  };
 }
diff --git a/modules/workspace/mpv.nix b/modules/workspace/mpv.nix
index 05eaebe..336576e 100644
--- a/modules/workspace/mpv.nix
+++ b/modules/workspace/mpv.nix
@@ -11,6 +11,6 @@ with deviceSpecific; {
       else
         "bestvideo+bestaudio/best";
       # cache-default = 4000000;
-    }
+    };
   };
 }
\ No newline at end of file