diff --git a/gentoo.sh b/gentoo.sh
index 8896ad8..f201361 100644
--- a/gentoo.sh
+++ b/gentoo.sh
@@ -41,9 +41,9 @@ FLATPAKS+=()
 SERVICES+=(cronie libvirt smartd cronie avahi-daemon cups grub-btrfsd sddm NetworkManager dev-zram0.swap)
 MAKEOPTS="-j$(cat /proc/cpuinfo | grep -i processor | grep -vi 'model' | wc -l)"
 DESKTOP_USE_FLAGS="wxwidgets jumbo-build kernel-install hwaccel sasl usb usbredir spice vhost-net virtfs vnc -gpm proprietary-codecs screencast systemd x264 pulseaudio firmware nfsv4 caps zeroconf dbus sound-server X -browser-integration desktop-portal minimal -gnome qt5 kde dvd alsa gui -wayland device-mapper efiemu themes truetype btrfs seccomp cgroup-hybrid geoclue -webengine boot browser keeshare network opengl"
-SERVER_USE_FLAGS="-gtk kernel-install -pipewire -bluetooth udev -sound -gtk -ipv6 sasl usb usbredir spice vhost-net virtfs -vnc  -wayland -gpm -proprietary-codecs -screencast systemd pulseaudio sound-server -x264 firmware nfsv4 caps zeroconf dbus -X -browser-integration desktop-portal minimal  -gnome -qt5 -kde -dvd -alsa -gui device-mapper efiemu themes truetype btrfs seccomp cgroup-hybrid geoclue -webengine boot -browser -keeshare network -opengl"
+SERVER_USE_FLAGS="-gtk kernel-install -pipewire -bluetooth udev -sound -ipv6 sasl usb usbredir spice vhost-net virtfs -vnc  -wayland -gpm -proprietary-codecs -screencast systemd pulseaudio sound-server -x264 firmware nfsv4 caps zeroconf dbus -X -browser-integration desktop-portal minimal  -gnome -qt5 -kde -dvd -alsa -gui device-mapper efiemu themes truetype btrfs seccomp cgroup-hybrid geoclue -webengine boot -browser -keeshare network -opengl"
 BASE_PACKAGES=" mail-mta/postfix app-admin/sysstat sys-apps/smartmontools sys-process/cronie net-fs/samba net-fs/nfs-utils net-firewall/iptables dev-python/pip sys-fs/inotify-tools net-analyzer/nmap x11-apps/xhost app-misc/screen app-portage/gentoolkit sys-fs/dosfstools app-admin/sudo sys-apps/systemd sys-boot/plymouth sys-apps/zram-generator app-eselect/eselect-repository dev-vcs/git sys-boot/refind sys-block/parted sys-boot/grub sys-block/zram-init sys-process/btop net-vpn/wireguard-tools sys-apps/flatpak app-editors/vim app-misc/fastfetch net-misc/yt-dlp app-containers/crun app-containers/podman net-fs/samba sys-fs/btrfs-progs net-print/cups app-emulation/virt-manager app-emulation/qemu app-emulation/libvirt sys-firmware/edk2-ovmf-bin "
-DESKTOP_PACKAGES=" kde-apps/kcalc kde-apps/dolphin kde-apps/ark www-client/firefox  plasma-meta app-editors/vscodium kde-apps/konsole media-gfx/krita  kde-apps/kdegraphics-meta app-admin/keepassxc app-office/calligra net-im/telegram-desktop-bin net-misc/nextcloud-client net-im/neochat x11-misc/sddm  media-video/vlc "
+DESKTOP_PACKAGES=" x11-drivers/xf86-input-evdev kde-apps/kcalc kde-apps/dolphin kde-apps/ark www-client/firefox  plasma-meta app-editors/vscodium kde-apps/konsole media-gfx/krita  kde-apps/kdegraphics-meta app-admin/keepassxc app-office/calligra net-im/telegram-desktop-bin net-misc/nextcloud-client net-im/neochat x11-misc/sddm  media-video/vlc "
 USE_FLAGS=""
 PACKAGES=""
 INSTALL_TYPE="desktop"
@@ -202,6 +202,21 @@ distccConfigure() {
 	fi
 }
 
+installCockpit() {
+	COCKPIT_PACKAGES+=(app-admin/cockpit-podman app-admin/cockpit-machines app-admin/cockpit-navigator app-admin/cockpit app-crypt/sscg)
+	for i in "${COCKPIT_PACKAGES[@]}"; do
+		echo "$i ~amd64" >>/etc/portage/package.accept_keywords
+	done
+	eselect repository enable inode64-overlay
+	eselect repository enable http://gpo.zugaina.org/Overlays/gig
+	emerge --sync inode64-overlay
+	emerge --sync gig
+
+	emerge $COCKPIT_PACKAGES --autounmask-write
+	etc-update -q --automode -5
+	emerge $COCKPIT_PACKAGES
+}
+
 buildGentoo() {
 
 	if [ ! -d "$TARGET/var/db/repos/gentoo/x11-misc" ]; then
@@ -531,6 +546,8 @@ menu() {
 			fstab
 			sed -i "s/-O2/-march=$CPU_TYPE -O2/i" $TARGET/etc/portage/make.conf
 			echo "USE=\"$USE_FLAGS\"" >>$TARGET/etc/portage/make.conf
+			echo "VIDEO_CARDS=\"amdgpu radeon radeonsi fbdev intel vesa nvidia-drivers\"" >>$TARGET/etc/portage/make.conf
+
 			if [ -z "$DISTCC_LISTEN" ]; then
 				echo
 				echo "Not using DistCC"
@@ -692,6 +709,8 @@ elif [ "$1" = "steam" ]; then
 	installSteam
 elif [ "$1" = "grub-snapshots" ]; then
 	grub-snapshots
+elif [ "$1" = "cockpit" ]; then
+	installCockpit
 elif [ "$1" = "btrfs-tweaks" ]; then
 	btrfs-tweaks
 elif [ "$1" = "remove-snapshot" ]; then