diff --git a/scripts/install-os-packages.sh b/scripts/install-os-packages.sh
index cb7d52f..8ac6960 100755
--- a/scripts/install-os-packages.sh
+++ b/scripts/install-os-packages.sh
@@ -27,7 +27,7 @@ setup() {
         dnf_setup
         ;;
     "freebsd")
-        OS_INSTALL_COMMAND="pkg install -y --skip-unresolvable"
+        OS_INSTALL_COMMAND="pkg install -y"
         OS_PKG_CHECK_COMMAND="pkg search"
         freebsd_setup
         ;;
@@ -43,12 +43,15 @@ freebsd_setup() {
     sudo pkg update && sudo pkg upgrade
 
     # Install KDE WM
-    sudo pkg install -y xorg kde5 sddm
+    sudo pkg install -y xorg kde5 sddm nvidia-driver
 
     # Add current user to video & wheel group
     sudo pw groupmod video -m "$(whoami)"
     sudo pw groupmod wheel -m "$(whoami)"
 
+    # Load nvidia drivers to kernel
+    sudo sysrc kld_list+="nvidia-modeset nvidia"
+
     # Enable services that will be needed
     sudo sysrc dbus_enable="YES"
     sudo sysrc sddm_enable="YES"
diff --git a/scripts/install.sh b/scripts/install.sh
index da89236..8fe71d8 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -16,7 +16,9 @@ rustlang() {
 }
 
 manual_installs() {
-    kitty_term
+    if [ "$(uname -s)" != "FreeBSD" ]; then
+    	kitty_term
+    fi
     rustlang
 }
 
diff --git a/scripts/package-list-brew b/scripts/package-list-brew
index 12eb0b0..853152a 100644
--- a/scripts/package-list-brew
+++ b/scripts/package-list-brew
@@ -29,5 +29,3 @@ tokei
 tree-sitter
 yt-dlp
 zoxide
-zsh-autosuggestions
-zsh-syntax-highlighting
diff --git a/scripts/package-list-os b/scripts/package-list-os
index 221185e..1a33976 100644
--- a/scripts/package-list-os
+++ b/scripts/package-list-os
@@ -6,7 +6,6 @@ build-essential
 libreadline-dev
 libavcodec-extra
 nvidia-driver
-synaptic
 # Below few are dnf-only packages
 akmod-nvidia
 dnf-plugins-core
@@ -17,10 +16,7 @@ aspnetcore-runtime-8.0
 bash
 bleachbit
 brave-browser
-ca-certificates
-clang
 cmake
-code
 containerd.io
 curl
 docker-buildx-plugin
@@ -29,14 +25,11 @@ docker-ce-cli
 docker-compose-plugin
 dolphin
 dolphin-plugins
-dnscrypt-proxy
 dotnet-runtime-8.0
 dotnet-sdk-8.0
 evolution-ews
 evolution-mapi
-extra-cmake-modules
 ffmpeg
-firefox
 flameshot
 flatpak
 gcc
@@ -48,13 +41,10 @@ gparted
 grub-customizer
 htop
 kde-spectacle
-kdeconnect
 kitty-terminfo
 llvm
-lua
 lua5.3
 luajit
-make
 nala
 neovim
 net-tools
@@ -84,13 +74,30 @@ zsh
 bat
 fd-find
 fzf
+firefox-esr
+gitleaks
 jq
+kitty
+lazygit
 libreoffice
 lua54
+podman
 rclone
-shellcheck
-sqlite3
+sqlite
+tokei
 tree-sitter
 vscode
 yt-dlp
 zoxide
+
+# Conflicts on FreeBSD
+ca-certificates
+clang
+code
+dnscrypt-proxy
+extra-cmake-modules
+firefox
+kdeconnect
+lua
+make
+synaptic