diff --git a/docs/TODO.md b/docs/TODO.md
index 637cc55..f1a87c5 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,13 +1,10 @@
 # Todolist
 
 - [ ] Installation script
-- [ ] Find a new icon theme (White, flat)
-- [ ] Global font-size config (Alt font size for waybar)
 - [ ] Themes
   - [ ] Catppuccin theme
   - [ ] Windows theme
   - [ ] MacOS theme
-- [ ] Global variable for config location
 - [ ] Make hyprcursor work
 - [ ] Nixvim
   - [ ] Telescope shortcut for file content
diff --git a/home/programs/kitty/default.nix b/home/programs/kitty/default.nix
index 2d0a88c..e2088cc 100644
--- a/home/programs/kitty/default.nix
+++ b/home/programs/kitty/default.nix
@@ -18,7 +18,7 @@
 
       # Font
       font_family = config.var.theme.font-mono;
-      font_size = 13;
+      font_size = config.var.theme.font-size;
 
       # Colors
       background = "#" + config.var.theme.colors.bg;
diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix
index 85cd0d3..32daca5 100644
--- a/home/system/gtk/default.nix
+++ b/home/system/gtk/default.nix
@@ -12,13 +12,13 @@
     theme = { name = "FlatColor"; };
 
     iconTheme = {
-      package = pkgs.flat-remix-icon-theme;
-      name = "Flat-Remix-Grey-Darkest";
+      package = pkgs.moka-icon-theme;
+      name = "Moka";
     };
 
     font = {
       name = config.var.theme.font;
-      size = 11;
+      size = config.var.theme.font-size;
     };
   };
 
diff --git a/home/system/hyprland/hyprlock.nix b/home/system/hyprland/hyprlock.nix
index cdf4622..41ff436 100644
--- a/home/system/hyprland/hyprlock.nix
+++ b/home/system/hyprland/hyprlock.nix
@@ -61,7 +61,7 @@
           text = ''
             Hey <span text_transform="capitalize" size="larger">$USER</span>'';
           color = "rgb(${config.var.theme.colors.fg})";
-          font_size = 20;
+          font_size = config.var.theme.font-size;
           font_family = config.var.theme.font;
           position = "0, 0";
           halign = "center";
@@ -72,7 +72,7 @@
           monitor = "";
           text = "Type to unlock!";
           color = "rgb(${config.var.theme.colors.fg})";
-          font_size = 16;
+          font_size = config.var.theme.font-size;
           font_family = config.var.theme.font;
           position = "0, 30";
           halign = "center";
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index a89554a..dc10fe1 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -157,7 +157,7 @@
           else
             "0"
         }px;
-        font-size: 13px;
+        font-size: ${toString config.var.theme.waybar.font-size}px;
       }
 
       .modules-left, .modules-center, .modules-right {
@@ -232,7 +232,7 @@
 
       #custom-logo {
         padding-right: 7px;
-        font-size: 15px;
+        font-size: ${toString config.var.theme.waybar.font-size}px;
         color: #${config.var.theme.colors.accent};
       }
 
diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix
index 17817ae..ec47ff6 100644
--- a/home/system/wofi/default.nix
+++ b/home/system/wofi/default.nix
@@ -37,7 +37,7 @@
       * {
         font-family: "${config.var.theme.font}";
         font-weight: 500;
-        font-size: 12px;
+        font-size: ${toString config.var.theme.font-size}px;
       }
 
       #window {
diff --git a/hosts/guest/configuration.nix b/hosts/guest/configuration.nix
index 3186847..5fbe828 100644
--- a/hosts/guest/configuration.nix
+++ b/hosts/guest/configuration.nix
@@ -122,7 +122,7 @@
   system.autoUpgrade = if config.var.autoUpgrade then {
     enable = true;
     dates = "04:00";
-    flake = "${config.users.users.${config.var.username}.home}/.config/nixos";
+    flake = "${config.var.configDirectory}";
     flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
     allowReboot = false;
   } else
diff --git a/hosts/guest/variables.nix b/hosts/guest/variables.nix
index 87bafb3..cb9a576 100644
--- a/hosts/guest/variables.nix
+++ b/hosts/guest/variables.nix
@@ -5,6 +5,7 @@
     hostname = "nixy";
     username = "your_username";
     homeDirectory = "/home/" + config.var.username;
+    configDirectory = config.var.homeDirectory + "/.config/nixos";
 
     keyboardLayout = "fr";
 
@@ -21,9 +22,12 @@
 
     autoUpgrade = false;
     autoGarbageCollector = false;
-    sops = false;
     nextcloud = false;
+    # change the sops configuration if you want to enable that:
+    sops = false;
+    # change the nvim's obsidian configuration if you want to enable that:
+    obsidian = false;
 
-    theme = import ../themes/nixy.nix;
+    theme = import ../themes/nixy.nix; # select your theme here
   };
 }
diff --git a/hosts/themes/nixy.nix b/hosts/themes/nixy.nix
index cb35a03..3688f09 100644
--- a/hosts/themes/nixy.nix
+++ b/hosts/themes/nixy.nix
@@ -1,8 +1,9 @@
 {
   wallpaper = "lofi-computer.png";
 
-  font-mono = "FiraCode Nerd Font Mono";
   font = "SFProDisplay Nerd Font";
+  font-mono = "FiraCode Nerd Font Mono";
+  font-size = 13;
 
   rounding = 15;
   gaps-in = 12;
@@ -15,6 +16,7 @@
     transparent = true;
     float = true;
     position = "top";
+    font-size = 11;
   };
 
   colors = {