diff --git a/README.md b/README.md
index 2160bf0..8e2282c 100644
--- a/README.md
+++ b/README.md
@@ -40,11 +40,11 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
 
-- [Nixy](#nixy)
-  - [Table of Content](#table-of-content)
-  - [Gallery](#gallery)
-  - [Architecture](#architecture)
-  - [Installation](#installation)
+- [Nixy](#nixy)
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+  - [Installation](#installation)
   - [Documentation](#documentation)
 
 ## Gallery
@@ -60,7 +60,7 @@ It's a simple way to manage your system configuration and dotfiles.
   - `laptop` is mine
   - `guest` is a template that you can copy and modify for your own system
   - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
+  - `modules` are some nix files that you can import (nvidia, prime, fonts, ...)
 - 🤫 `secrets` are the secrets files encrypted with sops
 
 ## Installation
diff --git a/docs/src/README_template.md b/docs/src/README_template.md
index 1b8c39f..6e32b9b 100644
--- a/docs/src/README_template.md
+++ b/docs/src/README_template.md
@@ -1,7 +1,7 @@
 
 # Nixy
 
-**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+**Nixy** is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place.
 It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
@@ -19,10 +19,10 @@ It's a simple way to manage your system configuration and dotfiles.
 - 🏠 `home` are the dotfiles and configuration files for the user
 - 💻 `hosts` are the system configuration files
   - 'laptop' is my own configuration for my laptop with nvidia
-  - 'server' is for my nixos server
+  - 'server' is for my nixos server (w/nextcloud, nginx, vaultwarden, ...)
   - 'guest' is a *template* that you can copy and modify for *your own system*
   - 'themes' contains all the *themes* available (see [THEMES.md](docs/THEMES.md))
-  - 'shared' are some nix modules that you can import (nvidia, prime, fonts, ...)
+  - 'modules' are some nix modules that you can import (nvidia, prime, fonts, ...)
 - 🤫 `secrets` are the secrets files encrypted with sops
 
 ## Installation
diff --git a/docs/src/header.md b/docs/src/header.md
index 16257fc..41f02cb 100644
--- a/docs/src/header.md
+++ b/docs/src/header.md
@@ -1,5 +1,5 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
 [//]: # (Date: {date})
 
diff --git a/hosts/guest/configuration.nix b/hosts/guest/configuration.nix
index 5fbe828..5c182b1 100644
--- a/hosts/guest/configuration.nix
+++ b/hosts/guest/configuration.nix
@@ -1,10 +1,10 @@
 { pkgs, config, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ../shared/fonts.nix
-    # ../shared/nvidia.nix
-    # ../shared/prime.nix
-    ../shared/tuigreet.nix
+    ../modules/fonts.nix
+    # ../modules/nvidia.nix
+    # ../modules/prime.nix
+    ../modules/tuigreet.nix
     ./variables.nix
   ];
 
diff --git a/hosts/guest/variables.nix b/hosts/guest/variables.nix
index d353a9f..5bf801f 100644
--- a/hosts/guest/variables.nix
+++ b/hosts/guest/variables.nix
@@ -1,5 +1,5 @@
 { config, ... }: {
-  imports = [ ../shared/variables-config.nix ];
+  imports = [ ../modules/variables-config.nix ];
 
   config.var = {
     hostname = "nixy";
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 05122f8..c3a6be7 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -1,10 +1,10 @@
 { pkgs, config, ... }: {
   imports = [
     ./hardware-configuration.nix
-    ../shared/fonts.nix
-    ../shared/nvidia.nix
-    ../shared/prime.nix
-    ../shared/tuigreet.nix
+    ../modules/fonts.nix
+    ../modules/nvidia.nix
+    ../modules/prime.nix
+    ../modules/tuigreet.nix
     ./variables.nix
   ];
 
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index 957710b..0137fe5 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -1,5 +1,5 @@
 { config, ... }: {
-  imports = [ ../shared/variables-config.nix ];
+  imports = [ ../modules/variables-config.nix ];
 
   config.var = {
     hostname = "nixy";
diff --git a/hosts/shared/fonts.nix b/hosts/modules/fonts.nix
similarity index 100%
rename from hosts/shared/fonts.nix
rename to hosts/modules/fonts.nix
diff --git a/hosts/shared/nginx.nix b/hosts/modules/nginx.nix
similarity index 100%
rename from hosts/shared/nginx.nix
rename to hosts/modules/nginx.nix
diff --git a/hosts/shared/nvidia.nix b/hosts/modules/nvidia.nix
similarity index 100%
rename from hosts/shared/nvidia.nix
rename to hosts/modules/nvidia.nix
diff --git a/hosts/shared/openssh.nix b/hosts/modules/openssh.nix
similarity index 100%
rename from hosts/shared/openssh.nix
rename to hosts/modules/openssh.nix
diff --git a/hosts/shared/prime.nix b/hosts/modules/prime.nix
similarity index 100%
rename from hosts/shared/prime.nix
rename to hosts/modules/prime.nix
diff --git a/hosts/shared/tuigreet.nix b/hosts/modules/tuigreet.nix
similarity index 100%
rename from hosts/shared/tuigreet.nix
rename to hosts/modules/tuigreet.nix
diff --git a/hosts/shared/variables-config.nix b/hosts/modules/variables-config.nix
similarity index 100%
rename from hosts/shared/variables-config.nix
rename to hosts/modules/variables-config.nix
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index e8f86ef..4e73dcc 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -2,8 +2,8 @@
   imports = [
     ./hardware-configuration.nix
     ./variables.nix
-    ../shared/openssh.nix
-    ../shared/nginx.nix
+    ../modules/openssh.nix
+    ../modules/nginx.nix
   ];
 
   # Bootloader.
diff --git a/hosts/server/variables.nix b/hosts/server/variables.nix
index 94363c0..738f241 100644
--- a/hosts/server/variables.nix
+++ b/hosts/server/variables.nix
@@ -1,5 +1,5 @@
 { config, ... }: {
-  imports = [ ../shared/variables-config.nix ];
+  imports = [ ../modules/variables-config.nix ];
 
   config.var = {
     hostname = "jack-nixos";