diff --git a/20_post_install.txt b/20_post_install.txt
index 2264abc..210fbdd 100644
--- a/20_post_install.txt
+++ b/20_post_install.txt
@@ -8,10 +8,16 @@ sudo rm -r paru
 paru -Syy
 
 # GUI
-paru -S --noconfirm greetd greetd-regreet hyprland zsh-theme-powerlevel10k-git nerd-fonts kitty oh-my-zsh-git neovim wl-clipboard wofi yazi
+paru -S --noconfirm greetd hyprland zsh-theme-powerlevel10k-git nerd-fonts kitty oh-my-zsh-git neovim wl-clipboard wofi yazi
 
-# Copy the files in greetd/ to /etc/greetd
-sudo cp ./greetd/* /etc/greetd
+# Either tuigreet or regreet
+paru -S greetd-tuigreet
+sudo cp ./greetd/tuigreet/* /etc/greetd/
+# OR
+paru -S greetd-regreet
+sudo cp ./greetd/regreet/* /etc/greetd/
+sudo mkdir /usr/lib/backgrounds/
+# Add a jpg called greeter.jpg to the folder
 
 # Zinit
 bash -c "$(curl --fail --show-error --silent --location https://raw.githubusercontent.com/zdharma-continuum/zinit/HEAD/scripts/install.sh)"
diff --git a/21_nvim.txt b/21_nvim.txt
index 29c88b6..9ba551c 100644
--- a/21_nvim.txt
+++ b/21_nvim.txt
@@ -1,3 +1,8 @@
 paru -S nvim
 
+vim ~/.zshrc
+----
+export WAYLAND_DISPLAY=wayland-1
+----
+
 
diff --git a/30_hosting.txt b/30_hosting.txt
index 5dbde98..4649b4c 100644
--- a/30_hosting.txt
+++ b/30_hosting.txt
@@ -23,6 +23,6 @@ sudo cp ./index.html /srv/http
 sudo chown -R http:http /srv/http
 sudo chmod -R 755 /srv/http
 sudo chmod 644 /srv/http/index.html
-sudo cp turboteam.run /etc/nginx/sites-available/turboteam.run
-sudo ln -s /etc/nginx/sites-available/turboteam.run /etc/nginx/sites-enabled/
+sudo cp turboteam.run /etc/nginx/sites-available/turboteam.run.conf
+sudo ln -s /etc/nginx/sites-available/turboteam.run.conf /etc/nginx/sites-enabled/
 sudo systemctl reload nginx
diff --git a/greetd/config.toml b/greetd/config.toml
deleted file mode 100644
index 5cec015..0000000
--- a/greetd/config.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[terminal]
-# The VT to run the greeter on. Can be "next", "current" or a number
-# designating the VT.
-vt = 1
-
-# The default session, also known as the greeter.
-[default_session]
-
-# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
-# with whatever you want started, such as `sway`.
-command = "Hyprland --config /etc/greetd/hyprland.conf"
-
-# The user to run the command as. The privileges this user must have depends
-# on the greeter. A graphical greeter may for example require the user to be
-# in the `video` group.
-user = "iborrelli"
diff --git a/greetd/regreet/config.toml b/greetd/regreet/config.toml
new file mode 100644
index 0000000..b4c6090
--- /dev/null
+++ b/greetd/regreet/config.toml
@@ -0,0 +1,7 @@
+[terminal]
+vt = 1
+
+[default_session]
+command = "Hyprland --config /etc/greetd/hyprland.conf"
+user = "iborrelli"
+
diff --git a/greetd/regreet/hyprland.conf b/greetd/regreet/hyprland.conf
new file mode 100644
index 0000000..c24a1b9
--- /dev/null
+++ b/greetd/regreet/hyprland.conf
@@ -0,0 +1 @@
+exec-once = regreet; hyprctl dispatch exit
diff --git a/greetd/regreet/regreet.toml b/greetd/regreet/regreet.toml
new file mode 100644
index 0000000..97ff75f
--- /dev/null
+++ b/greetd/regreet/regreet.toml
@@ -0,0 +1,18 @@
+[commands]
+reboot = [ "systemctl", "reboot" ]
+poweroff = [ "systemctl", "poweroff" ]
+
+[background]
+path = "/usr/share/backgrounds/greeter.jpg"
+fit = "Cover"
+
+[GTK]
+application_prefer_dark_theme = true
+cursor_theme_name = "Adwaita"
+font_name = "CaskaydiaCove Nerd Font Mono 16"
+icon_theme_name = "Adwaita"
+theme_name = "Adwaita"
+
+[widget.clock]
+format = "%a %F %H:%M (%Z)"
+resolution = "100ms"
diff --git a/greetd/tuigreet/config.toml b/greetd/tuigreet/config.toml
new file mode 100644
index 0000000..aac3f17
--- /dev/null
+++ b/greetd/tuigreet/config.toml
@@ -0,0 +1,7 @@
+[terminal]
+vt = 2
+
+[default_session]
+command = "tuigreet --window-padding 2 --time -r --remember-session --theme 'border=brightyellow;text=cyan;input=brightcyan;time=brightwhite;action=brightwhite;button=white;container=black;prompt=brightmagenta'"
+user = "iborrelli"
+