diff --git a/hosts/kopavogur/readme.org b/hosts/kopavogur/README.org
similarity index 100%
rename from hosts/kopavogur/readme.org
rename to hosts/kopavogur/README.org
diff --git a/hosts/reykjavik/readme.org b/hosts/reykjavik/README.org
similarity index 100%
rename from hosts/reykjavik/readme.org
rename to hosts/reykjavik/README.org
diff --git a/modules/app/firefox.nix b/modules/app/firefox.nix
new file mode 100644
index 0000000..6eefab8
--- /dev/null
+++ b/modules/app/firefox.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.app.firefox;
+in
+{
+  options.samfelag.modules.app.firefox = {
+    enable = lib.mkEnableOption "firefox";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      firefox
+    ];
+  };
+}
diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
index 0b0f301..a9adc47 100644
--- a/modules/desktop/desktop.nix
+++ b/modules/desktop/desktop.nix
@@ -28,8 +28,6 @@ in
       brightnessctl
       playerctl
       feh
-      rofi
-      firefox
     ] ++ optionals cfg.laptop laptopPkgs;
 
     # - Audio ------------------------------------
@@ -51,8 +49,12 @@ in
     # - Modules ----------------------------------
 
     samfelag.modules = {
+
+      # Basic
       app.alacritty.enable = true;
       desktop.polybar.enable = true;
+      desktop.rofi.enable = true;
+
       desktop.i3 = {
         enable = true;
         laptop = cfg.laptop;
@@ -60,6 +62,7 @@ in
         terminal.command = "${pkgs.alacritty}/bin/alacritty";
         browser.command = "${pkgs.firefox}/bin/firefox";
         locker.command = "${pkgs.i3lock-blur}/bin/i3lock-color -c 808F85 && sleep 1";
+      app.firefox.enable = true;
       };
     };
 
diff --git a/modules/desktop/i3.nix b/modules/desktop/i3.nix
index a7ea5a4..d982db1 100644
--- a/modules/desktop/i3.nix
+++ b/modules/desktop/i3.nix
@@ -56,6 +56,7 @@ in {
 
     environment.systemPackages = with pkgs; [
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
+      playerctl
     ];
 
     hm.xdg.dataFile."wallpapers".source = paths.wallpapers;
diff --git a/modules/desktop/rofi.nix b/modules/desktop/rofi.nix
new file mode 100644
index 0000000..08402bc
--- /dev/null
+++ b/modules/desktop/rofi.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.samfelag.modules.desktop.rofi;
+in
+{
+  options.samfelag.modules.desktop.rofi = {
+    enable = lib.mkEnableOption "rofi";
+  };
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      rofi
+    ];
+  };
+}