diff --git a/config/files/usr/bin/dx-user-gsettings b/config/files/usr/bin/dx-user-gsettings
index a89b65e..e8c1e28 100755
--- a/config/files/usr/bin/dx-user-gsettings
+++ b/config/files/usr/bin/dx-user-gsettings
@@ -5,6 +5,8 @@ USER_SETUP_VER=1
 USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/cabos/gsettings-configured"
 USER_SETUP_VER_RAN=$(cat "$USER_SETUP_VER_FILE")
 
+mkdir -p "$(dirname "$USER_SETUP_VER_FILE")" || exit 1
+
 ## Backup incase local.d config doesn't take for whatever reason
 
 # Run script if updated
diff --git a/config/files/usr/share/ublue-os/just/60-custom.just b/config/files/usr/share/ublue-os/just/60-custom.just
index 9fbf492..1756614 100644
--- a/config/files/usr/share/ublue-os/just/60-custom.just
+++ b/config/files/usr/share/ublue-os/just/60-custom.just
@@ -1,2 +1,97 @@
 import '100-bling.just'
 # Include some of your custom scripts here!
+
+# Configure GRUB screen with various options
+configure-grub ACTION="prompt":
+  #!/usr/bin/env bash
+  bold=$(tput bold)
+  normal=$(tput sgr0)
+  OPTION={{ ACTION }}
+  if [ "$OPTION" == "prompt" ]; then
+  echo "${bold}Configuring GRUB${normal}"
+  echo 'GRUB hiding option can be useful for making boot-times faster.'
+  echo 'Hide or Unhide GRUB? Press ESC to exit.'
+  OPTION=$(ugum choose "Unhide (Default)" Hide)
+  elif [ "$OPTION" == "help" ]; then
+    echo "Usage: ujust configure-grub <option>"
+    echo "  <option>: Specify the quick option - 'hide' or 'unhide'"
+    echo "  Use 'hide' to hide GRUB boot screen."
+    echo "  Use 'unhide' to revert to defaults."
+    exit 0
+  fi
+  if [ "${OPTION,,}" == "hide" ]; then
+    sudo sed -i 's/GRUB_TIMEOUT=5/GRUB_TIMEOUT=0/g' /etc/default/grub
+    output=$(echo 'GRUB_TIMEOUT_STYLE=hidden' | sudo tee -a /etc/default/grub 2>&1) || echo "$output" && false
+    output=$(echo 'GRUB_HIDDEN_TIMEOUT=1' | sudo tee -a /etc/default/grub 2>&1) || echo "$output" && false
+    if [ -d /sys/firmware/efi ]; then
+      output=$(sudo grub2-mkconfig -o /etc/grub2-efi.cfg 2>&1) || echo "$output" && false
+          echo 'Hide UEFI GRUB logs during boot setting applied.'
+    else
+      output=$(sudo grub2-mkconfig -o /etc/grub2.cfg 2>&1) || echo "$output" && false
+          echo 'Hide BIOS GRUB logs during boot setting applied.'
+    fi
+  elif [ "$OPTION" == "Unhide (Default)" ] || [ "${OPTION,,}" == "unhide" ]; then
+    sudo sed -i '/GRUB_HIDDEN_TIMEOUT=1/d' /etc/default/grub
+    sudo sed -i '/GRUB_TIMEOUT_STYLE=hidden/d' /etc/default/grub
+    sudo sed -i 's/GRUB_TIMEOUT=0/GRUB_TIMEOUT=5/g' /etc/default/grub
+    if [ -d /sys/firmware/efi ]; then
+      output=$(sudo grub2-mkconfig -o /etc/grub2-efi.cfg 2>&1) || echo "$output" && false
+          echo 'Reverted setting "UEFI GRUB logs during boot" to defaults.'
+    else
+      output=$(sudo grub2-mkconfig -o /etc/grub2.cfg 2>&1) || echo "$output" && false
+          echo 'Reverted setting "BIOS GRUB logs during boot" to defaults.'
+    fi
+  fi
+
+hibernate ACTION="prompt":
+  #!/usr/bin/env bash
+
+  HIBERNATION_SETUP_VER=1
+  HIBERNATION_SETUP_VER_FILE="/etc/ublue/hibernation"
+  HIBERNATION_SETUP_VER_RAN=$(cat "$HIBERNATION_SETUP_VER_FILE")
+
+  sudo mkdir -p "$(dirname "$HIBERNATION_SETUP_VER_FILE")" || exit 1
+
+  # Run script if updated
+  if [[ -f $HIBERNATION_SETUP_VER_FILE && "$HIBERNATION_SETUP_VER" = "$HIBERNATION_SETUP_VER_RAN" ]]; then
+    echo "Hibernation setup has already run. Exiting..."
+    exit 0
+  fi
+
+  # Get the total memory (RAM + Swap) in kilobytes from the 'free' command
+  total_memory_kb=$(free -k | awk '/^Mem:/ {mem=$2} /^Swap:/ {swap=$2} END {print mem + swap}')
+
+  # Convert kilobytes to gigabytes and round up
+  total_memory_gb=$(printf "%.0f" $(echo "scale=2; $total_memory_kb / 1024 / 1024" | bc))
+
+  sudo btrfs subvolume create /var/swap
+  sudo btrfs filesystem mkswapfile --size ${total_memory_gb}g --uuid clear /var/swap/swapfile
+
+  uuid_variable=$(sudo findmnt -no UUID -T /var/swap/swapfile)
+  swap_offset=$(sudo btrfs inspect-internal map-swapfile -r /var/swap/swapfile)
+
+  sudo rpm-ostree kargs --append="resume=UUID=$uuid_variable resume_offset=$swap_offset"
+  echo '/var/swap/swapfile    none    swap    defaults,pri=0 0 0' | sudo tee -a /etc/fstab
+  sudo swapon /var/swap/swapfile
+
+  sudo semanage fcontext -a -t swapfile_t '/var/swap(/.*)?'
+  sudo restorecon -RF /var/swap
+
+  cd /tmp
+
+  sudo audit2allow -b -M systemd_hibernate
+  sudo semodule -i systemd_hibernate.pp
+
+  sudo audit2allow -b -M systemd_sleep
+  sudo semodule -i systemd_sleep.pp
+
+  echo 'AllowHibernation=yes' | sudo tee -a /etc/systemd/sleep.conf
+  echo 'AllowSuspendThenHibernate=yes' | sudo tee -a /etc/systemd/sleep.conf
+  echo 'HibernateDelaySec=90min' | sudo tee -a /etc/systemd/sleep.conf
+  echo 'HibernateMode=shutdown' | sudo tee -a /etc/systemd/sleep.conf
+  echo 'SuspendEstimationSec=60min' | sudo tee -a /etc/systemd/sleep.conf
+
+  echo 'HandleLidSwitch=suspend-then-hibernate' | sudo tee -a /etc/systemd/logind.conf
+  echo 'HandleLidSwitchExternalPower=suspend-then-hibernate' | sudo tee -a /etc/systemd/logind.conf
+
+  echo "$HIBERNATION_SETUP_VER" | sudo tee "$HIBERNATION_SETUP_VER_FILE"