diff --git a/setup.sh b/setup.sh
index 257b632..616daa3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -87,31 +87,15 @@ printfe() {
     printf "$color$format$normal" "$message"
 }
 
-# Helper functions
-log_info() {
-    println "$1" "green"
-}
-
-log_success() {
-    println "$1" "green"
-}
-
-log_error() {
-    println "$1" "red" >&2
-}
-
-log_warning() {
-    println "$1" "yellow" >&2
-}
-
+# Helper function for error & exit
 die() {
-    log_error "$1"
+    println "$1" "red" >&2
     exit 1
 }
 
 # Request sudo credentials upfront
 request_sudo() {
-    log_info "Requesting sudo privileges to avoid interruptions later..."
+    println "Requesting sudo privileges to avoid interruptions later..." "green"
     sudo -v || die "Failed to obtain sudo privileges"
     
     # Keep sudo credentials refreshed in the background
@@ -121,7 +105,7 @@ request_sudo() {
     # Ensure we kill the keepalive process when the script exits
     trap 'kill $SUDO_KEEPALIVE_PID 2>/dev/null || true' EXIT
     
-    log_success "Sudo privileges obtained."
+    println "Sudo privileges obtained." "green"
 }
 
 # Ensure we're running interactively
@@ -145,7 +129,7 @@ backup_file() {
     local need_sudo="${2:-false}"
 
     if [ -f "$file" ]; then
-        log_info "Backing up $file to $file.bak..."
+        println "Backing up $file to $file.bak..." "green"
         if [ "$need_sudo" = "true" ]; then
             sudo mv "$file" "$file.bak" || die "Failed to backup $file (sudo)"
         else
@@ -154,7 +138,6 @@ backup_file() {
     fi
 }
 
-
 check_prerequisites() {
     command -v git >/dev/null 2>&1 || die "Git is required but not installed"
     command -v sudo >/dev/null 2>&1 || die "Sudo is required but not installed"
@@ -213,16 +196,16 @@ update_home_manager_flake() {
 
     # Replace original file
     mv "$temp_file" "$flake_file" || return 1
-    log_success "Home Manager Flake configuration added successfully."
+    println "Home Manager Flake configuration added successfully." "green"
 }
 
 install_nix() {
     if command -v nix-channel >/dev/null 2>&1; then
-        log_success "Detected Nix, skipping Nix setup."
+        println "Detected Nix, skipping Nix setup." "green"
         return 0
     fi
 
-    log_info "Nix not detected, installing Nix..."
+    println "Nix not detected, installing Nix..." "green"
     curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix -o install-nix.sh || \
         die "Failed to download Nix installer"
     
@@ -232,34 +215,34 @@ install_nix() {
 }
 
 setup_symlinks() {
-    log_info "Setting up symlinks..."
+    println "Setting up symlinks..." "green"
 
     # Backup and create symlinks for user files
     backup_file "$HOME/.bashrc"
     backup_file "$HOME/.profile"
 
     if [ -d "$HOME/.config/home-manager" ]; then
-        log_info "Backing up ~/.config/home-manager to ~/.config/home-manager.bak..."
+        println "Backing up ~/.config/home-manager to ~/.config/home-manager.bak..." "green"
         mv "$HOME/.config/home-manager" "$HOME/.config/home-manager.bak" || \
             die "Failed to backup home-manager config"
     fi
 
-    log_info "Linking ~/.config/home-manager to $DOTFILES_PATH/config/home-manager..."
+    println "Linking ~/.config/home-manager to $DOTFILES_PATH/config/home-manager..." "green"
     ln -s "$DOTFILES_PATH/config/home-manager" "$HOME/.config/home-manager" || \
         die "Failed to create home-manager symlink"
 
     # Verify symlinks
     confirm_symlink "$HOME/.config/home-manager" "Failed to set up home-manager symlink"
-    log_success "Symlinks set up successfully."
+    println "Symlinks set up successfully." "green"
 }
 
 install_home_manager() {
     if command -v home-manager >/dev/null 2>&1; then
-        log_success "Home Manager already installed. Skipping..."
+        println "Home Manager already installed. Skipping..." "green"
         return 0
     fi
 
-    log_info "Installing Home Manager..."
+    println "Installing Home Manager..." "green"
     nix-channel --add "https://github.com/nix-community/home-manager/archive/release-$NIXOS_RELEASE.tar.gz" home-manager || die "Failed to add home-manager channel"
     nix-channel --update || die "Failed to update channels"
     nix-shell '<home-manager>' -A install || die "Failed to install home-manager"
@@ -274,57 +257,57 @@ prepare_hostname() {
         if ! validate_hostname "$hostname"; then
             die "Invalid hostname provided. Please use a valid hostname."
         fi
-        log_info "Using provided hostname: $hostname"
+        println "Using provided hostname: $hostname" "green"
     # Check if hostname is already set
     elif [ -f "$hostname_file" ]; then
         hostname=$(cat "$hostname_file")
-        log_success "Hostname already found in $hostname_file. Using $hostname."
+        println "Hostname already found in $hostname_file. Using $hostname." "green"
         return
     else
         die "No hostname provided. Please provide a hostname as the first argument."
     fi
 
-    log_info "Setting hostname to $hostname..."
+    println "Setting hostname to $hostname..." "green"
     sudo hostnamectl set-hostname "$hostname" || die "Failed to set hostname"
 
     echo "$hostname" > "$hostname_file" || die "Failed to save hostname"
-    log_success "Hostname set successfully."
+    println "Hostname set successfully." "green"
 }
 
 warning_prompt() {
-    log_success "This script will set up your machine using Menno's Dotfiles repository.\n"
-    log_error "Please ensure you have a backup of your data before proceeding."
-    log_error "This script will modify system files and may require sudo permissions.\n"
-    log_info "This script works best on a fresh Fedora, Ubuntu or Arch Linux installation."
-    log_info "Setup starts in 5 seconds, to abort use Ctrl+C to exit NOW."
+    println "This script will set up your machine using Menno's Dotfiles repository.\n" "green"
+    println "Please ensure you have a backup of your data before proceeding." "red"
+    println "This script will modify system files and may require sudo permissions.\n" "red"
+    println "This script works best on a fresh Fedora, Ubuntu or Arch Linux installation." "green"
+    println "Setup starts in 5 seconds, to abort use Ctrl+C to exit NOW." "green"
     sleep 5
 
     echo ""
-    log_info "Starting setup..."
+    println "Starting setup..." "green"
 }
 
 check_selinux() {
     # Check if distro has SELinux at all:
     if [ ! -d /etc/selinux ]; then
-        log_success "SELinux not found. Skipping..."
+        println "SELinux not found. Skipping..." "green"
         return 0
     fi
 
     # Check if getenforce exists, if not it means we don't have SELinux
     if ! command -v getenforce >/dev/null 2>&1; then
-        log_success "SELinux not found. Skipping..."
+        println "SELinux not found. Skipping..." "green"
         return 0
     fi
 
     # Check if getenforce is returning Enforcing
     if [ "$(getenforce)" = "Enforcing" ]; then
-        log_warning "SELinux is enabled. Adjusting SELinux to permissive mode..."
+        println "SELinux is enabled. Adjusting SELinux to permissive mode..." "yellow"
         sudo setenforce Permissive || die "Failed to disable SELinux"
         sudo tee /etc/selinux/config << EOF > /dev/null || die "Failed to write to /etc/selinux/config"
 SELINUX=permissive
 SELINUXTYPE=targeted
 EOF
-        log_success "SELinux disabled successfully."
+        println "SELinux disabled successfully." "green"
     fi
 }
 
@@ -353,12 +336,12 @@ attempt_package_install() {
     elif command -v pacman >/dev/null; then
         package_manager="pacman"
     else
-        log_error "No supported package manager was found, aborting setup..."
+        println "No supported package manager was found, aborting setup..." "red"
         exit 1
     fi
 
     if ! command -v "$package" >/dev/null 2>&1; then
-        log_info "Installing $package using $package_manager..."
+        println "Installing $package using $package_manager..." "green"
         if [ "$package_manager" = "dnf" ]; then
             sudo dnf install "$package" -y || die "Failed to install $package"
         elif [ "$package_manager" = "apt" ]; then
@@ -395,16 +378,16 @@ check_compatibility() {
 
     case "$distro" in
         Fedora*)
-            log_success "Detected Fedora. Proceeding with setup..."
+            println "Detected Fedora. Proceeding with setup..." "green"
             check_command_availibility "dnf"
             ;;
         Ubuntu)
-            log_success "Detected Ubuntu. Proceeding with setup..."
+            println "Detected Ubuntu. Proceeding with setup..." "green"
             check_command_availibility "apt"
             ;;
         Arch*)
-            log_warning "Detected Arch Linux. Setup has not been tested on Arch Linux."
-            log_warning "Proceed at your own risk..."
+            println "Detected Arch Linux. Setup has not been tested on Arch Linux." "yellow"
+            println "Proceed at your own risk..." "yellow"
             check_command_availibility "pacman"
             ;;
         *)
@@ -418,9 +401,9 @@ ensure_shell() {
     local shell
     shell=$(getent passwd "$USER" | cut -d: -f7)
     if [ "$shell" != "/bin/bash" ]; then
-        log_info "Setting default shell to bash..."
+        println "Setting default shell to bash..." "green"
         chsh -s /bin/bash || die "Failed to set default shell to bash"
-        log_success "Default shell set to bash."
+        println "Default shell set to bash." "green"
     fi
 
     # Ensure shell is set for root user
@@ -428,9 +411,9 @@ ensure_shell() {
         local root_shell
         root_shell=$(getent passwd root | cut -d: -f7)
         if [ "$root_shell" != "/bin/bash" ]; then
-            log_info "Setting default shell for root to bash..."
+            println "Setting default shell for root to bash..." "green"
             sudo chsh -s /bin/bash root || die "Failed to set default shell for root to bash"
-            log_success "Default shell for root set to bash."
+            println "Default shell for root set to bash." "green"
         fi
     fi
 }
@@ -440,7 +423,7 @@ main() {
 
     # Check if setup has already been run
     if [ -f "$SETUP_MARKER" ]; then
-        log_info "Setup has already been run, exiting..."
+        println "Setup has already been run, exiting..." "green"
         exit 0
     fi
 
@@ -461,12 +444,12 @@ main() {
 
     # Clone dotfiles if needed
     if [ ! -d "$DOTFILES_PATH" ]; then
-        log_info "Cloning dotfiles repo..."
+        println "Cloning dotfiles repo..." "green"
         git clone "$GIT_REPO" "$DOTFILES_PATH" || die "Failed to clone dotfiles repository"
     fi
     
     if [ "$continue_flag" = "--continue" ]; then
-        log_info "Continuing setup..."
+        println "Continuing setup..." "green"
     else
         warning_prompt
         prepare_hostname "$hostname"
@@ -497,9 +480,9 @@ EOF
     touch "$SETUP_MARKER" || die "Failed to create setup marker"
 
     # Final success message
-    log_success "\nSetup complete. Please logout / restart to continue with 'dotf update'.\n"
-    log_error "\n!!! Please logout / restart to continue !!!"
-    log_error "~~~   Proceed by running 'dotf update'  ~~~\n"
+    println "\nSetup complete. Please logout / restart to continue with 'dotf update'.\n" "green"
+    println "\n!!! Please logout / restart to continue !!!" "red"
+    println "~~~   Proceed by running 'dotf update'  ~~~\n" "red"
 }
 
 main "$@"