diff --git a/gentoo-support/end4-recommended-use-flags b/gentoo-support/end4-recommended-use-flags
index cab28df84..ed3ba7815 100644
--- a/gentoo-support/end4-recommended-use-flags
+++ b/gentoo-support/end4-recommended-use-flags
@@ -64,7 +64,7 @@ kde-plasma/systemsettings -handbook
 ################### PORTAL ################### 
 sys-apps/xdg-desktop-portal seccomp
 #sys-plasma/xdg-desktop-portal-kde (nothing needed)
-sys-apps/xdg--desktop-portal-gtk X wayland
+sys-apps/xdg-desktop-portal-gtk X wayland
 #gui-libs/xdg-desktop-portal-hyprland (elogiind maybe)
 
 ################### PYTHON ################### 
@@ -111,4 +111,3 @@ dev-libs/glib dbus elf introspection mime xattr
 gui-apps/quickshell -X -i3 -i3-ipc -breakpad bluetooth hyprland hyprland-focus-grab hyprland-global-shortcuts jemalloc layer-shell mpris pam pipewire screencopy session-lock sockets toplevel-management tray wayland
 #app-i18n/translate-shell (nothing needed)
 #gui-apps/wlogout (no use flags)
-
diff --git a/gentoo-support/end4-unmasks b/gentoo-support/end4-unmasks
index e69de29bb..59ec974dd 100644
--- a/gentoo-support/end4-unmasks
+++ b/gentoo-support/end4-unmasks
@@ -0,0 +1,14 @@
+x11-misc/matugen
+media-fonts/twemoji
+gui-apps/hypridle
+gui-apps/hyprlock
+gui-apps/hyprpicker
+gui-apps/hyprsunset
+gui-libs/xdg-desktop-portal-hyprland
+gui-apps/hyprshot
+gui-apps/wf-recorder
+gui-apps/wtype
+gui-apps/fuzzel
+gui-apps/quickshell
+gui-apps/wlogout 
+dev-cpp/sdbus-c++ 
diff --git a/gentoo-support/gentoo-installer.sh b/gentoo-support/gentoo-installer.sh
index c7456f116..754efb142 100755
--- a/gentoo-support/gentoo-installer.sh
+++ b/gentoo-support/gentoo-installer.sh
@@ -6,7 +6,15 @@ arch=$(portageq envvar ACCEPT_KEYWORDS)
 
 print_message () {
 	message=$1
-	echo -e "\033[34m$message\033[0m"	
+	color=$2
+	if [[ ${color} = "r" ]]; then
+		echo -e "\033[31m$message\033[0m"	
+	elif [[ ${color} = "g" ]]; then
+		echo -e "\033[32m$message\033[0m"	
+	else
+		echo -e "\033[34m$message\033[0m"	
+	fi
+	color="b"
 }
 get_input () {
 	input_message=$1
@@ -37,11 +45,11 @@ exec_cmd () {
 	get_input "$message"
 	case "$bool_answer" in
 	0 )
-		echo -e "\033[32m+\033[2m $cmd\033[0m"
+		print_message "+ ${cmd}" "g"
 		[ ! -z "$cmd" ] && eval "$cmd"
 		;;
 	1 )
-		echo -e "\033[32m-\033[2m $cmd\033[0m"
+		print_message "- ${cmd}" "r"
 		[ "$terminate" == "y" ] && exit 1
 		;;
 	* )
@@ -51,19 +59,27 @@ exec_cmd () {
 	cmd=""
 }
 
-print_message "IF YOU WANT TO USE THE LATESt HYPRlAND VERSION YOU MUSt UNMASK it, CHANGE GCC VERSIONS TO A COMPATIBLE ONE, THEN EMERGE @world IF YOU YOUR CURRENT GCC WASN'T THE SAME."
+print_message "If you want to use the latest Hyprland version, you must unmask it first, the script does not do this. Change GCC version to a compatible one and then emerge @world."
 echo ""
 print_message "ARCHITECTURE DETECTED IS \033[32m$arch\033[0m"
 
-exec_cmd "sudo emerge --sync" "Sync portage"
-exec_cmd "sudo emerge --ask --verbose --update --deep --newuse @world" "Update @world"
-exec_cmd "sudo eselect repository create localrepo || true" "Create local repository"
-exec_cmd "sudo eselect repository enable localrepo || true" "Enable local repository"
+exec_cmd "sudo eselect repository create localrepo || true" "Create local repository (ignore errors)"
+exec_cmd "sudo eselect repository enable localrepo || true" "Enable local repository (ignore errors)"
+
 exec_cmd "sudo mkdir -p /var/db/repos/localrepo/app-misc/end4 || true" "Create directory for the eBuild"
 exec_cmd "sudo cp end4-1.0.ebuild /var/db/repos/localrepo/app-misc/end4" "Import the eBuild"
 exec_cmd "sudo ebuild /var/db/repos/localrepo/app-misc/end4/${ebuild_name} digest" "Digest the eBuild"
-exec_cmd "sudo cp end4-recommended-use-flags /etc/portage/package.use/end4" "Use recommended use flags"
-
+
+exec_cmd "sudo cp end4-unmasks /etc/portage/package.accept_keywords/end4 && sudo sed -i 's/$/ ~${arch}/' /etc/portage/package.accept_keywords/end4" "Import basic unmasks"
+
+exec_cmd "sudo cp end4-recommended-use-flags /etc/portage/package.use/end4" "Import recommended use flags"
+
+exec_cmd "sudo emerge --sync" "Sync portage"
+exec_cmd "sudo emerge --ask --verbose --update --deep --newuse @world" "Update @world"
+exec_cmd "sudo emerge --depclean" "Clean dependencies"
+
+exec_cmd "sudo emerge -q app-misc/end4" "Emerge end4 dot-files"
+exec_cmd "cp -r ../.config/* ~/.config" "Copy config files over"