diff --git a/modules/services/default.nix b/modules/services/default.nix
index 21b01b0e..535046f8 100755
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -5,6 +5,5 @@
 {
   imports = [
     ./recoll.nix
-    ./unison.nix
   ];
 }
diff --git a/modules/services/unison.nix b/modules/services/unison.nix
deleted file mode 100755
index 67bdb576..00000000
--- a/modules/services/unison.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-# When enabled, this will periodically backup your stuff as configured in '$UNISON/default.prf' (or not with the 'flags' option).
-{ config, options, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.modules.services.unison;
-in
-{
-  options.modules.services.unison = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-    };
-
-    flags = mkOption {
-      type = types.str;
-      default = "";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    my.home = {
-      systemd.user.services.unison = {
-        Unit = {
-          Description = "Unison backup";
-          Documentation = [ "https://www.cis.upenn.edu/~bcpierce/unison/docs.html" ];
-        };
-
-        Service = {
-          ExecStart = "${(pkgs.unison.override { enableX11 = false; })}/bin/unison ${cfg.flags}";
-          Environment = [ "UNISON=\"$XDG_DATA_HOME/unison\"" ];
-          RestartSec = "2h";
-        };
-
-        Install = {
-          WantedBy = [ "default.target" ];
-        };
-      };
-    };
-  };
-}
diff --git a/packages/veikk-driver.nix b/packages/veikk-driver.nix
index 585fa97b..4184df94 100755
--- a/packages/veikk-driver.nix
+++ b/packages/veikk-driver.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   patchPhase = ''
-    sed -i Makefile -e 's/modprobe veikk//' -e 's/depmod//'
+    sed -i Makefile -e 's/modprobe veikk/#modprobe veikk/' -e 's/depmod/#depmod/'
   '';
 
   INSTALL_MOD_PATH = "\${out}";
diff --git a/templates/themes/fair-and-square/cookiecutter.json b/templates/themes/fair-and-square/cookiecutter.json
index f330b482..655d64e1 100755
--- a/templates/themes/fair-and-square/cookiecutter.json
+++ b/templates/themes/fair-and-square/cookiecutter.json
@@ -1,5 +1,6 @@
 {
     "name": "Fair and square",
+    "slug": "{{ cookiecutter.name | slugify }}",
     "version": "0.1.0",
     "special": {
         "background": "#2E3440",
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/README.adoc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/README.adoc
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/README.adoc
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/README.adoc
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/alacritty/alacritty.yml b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/alacritty/alacritty.yml
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/alacritty/alacritty.yml
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/bspwm/bspwmrc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/bspwm/bspwmrc
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/bspwm/bspwmrc
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/dunst/dunstrc b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/dunst/dunstrc
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/dunst/dunstrc
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/polybar/config b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/polybar/config
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/polybar/config
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/config.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/config.rasi
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/config.rasi
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/config.rasi
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/dmenu.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/dmenu.rasi
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/dmenu.rasi
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/fds-center-menu.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/fds-center-menu.rasi
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-center-menu.rasi
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/fds-mini-sidebar.rasi b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/rofi/themes/fds-mini-sidebar.rasi
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/rofi/themes/fds-mini-sidebar.rasi
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/wallpaper b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/wallpaper
similarity index 100%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/config/wallpaper
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/config/wallpaper
diff --git a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/default.nix b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/default.nix
similarity index 82%
rename from templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/default.nix
rename to templates/themes/fair-and-square/{{ cookiecutter.slug }}/default.nix
index e14f4830..fc70e383 100755
--- a/templates/themes/fair-and-square/{{ cookiecutter.name | slugify }}/default.nix	
+++ b/templates/themes/fair-and-square/{{ cookiecutter.slug }}/default.nix	
@@ -2,21 +2,14 @@
 
 with lib;
 {
-  options.modules.themes."{{ cookiecutter.name | slugify }}" = {
+  options.modules.themes."{{ cookiecutter.slug }}" = {
     enable = mkOption {
       type = types.bool;
       default = false;
     };
   };
 
-  config = mkIf config.modules.themes."{{ cookiecutter.name | slugify }}".enable {
-    # Pass the metadata of the theme.
-    modules.theme = {
-      name = "{{ cookiecutter.name }}";
-      version = "{{ cookiecutter.version }}";
-      path = ./.;
-    };
-
+  config = mkIf config.modules.themes."{{ cookiecutter.slug }}".enable {
     services = {
       # Enable picom compositor.
       picom = {
@@ -29,8 +22,6 @@ with lib;
       xserver = {
         displayManager = {
           lightdm.enable = true;
-          lightdm.greeters.mini.enable = true;
-          lightdm.greeters.mini.user = config.my.username;
           defaultSession = "none+bspwm";
         };
         enable = true;
@@ -45,6 +36,9 @@ with lib;
       # Enable GTK configuration.
       gtk.enable = true;
 
+      # Set the wallpaper.
+      home.file.".background-image".source = ./config/wallpaper;
+
       # Enable QT configuration and set it to the same GTK config.
       qt.enable = true;
       qt.platformTheme = "gtk";
@@ -89,14 +83,14 @@ with lib;
           '';
         })
       ];
-    };
 
-    # Set the cursor theme.
-    xdg.dataFile = {
-      "icons/default/index.theme".text = ''
-        [icon theme]
-        Inherits=Adwaita
-      '';
+      # Set the cursor theme.
+      xdg.dataFile = {
+        "icons/default/index.theme".text = ''
+          [icon theme]
+          Inherits=Adwaita
+        '';
+      };
     };
 
     my.packages = with pkgs; [