diff --git a/scripts/installs/flatpak.sh b/scripts/installs/flatpak.sh
index 0c30527..ce9d454 100644
--- a/scripts/installs/flatpak.sh
+++ b/scripts/installs/flatpak.sh
@@ -9,15 +9,22 @@
 # - Check app not already installed via system package manager       #
 # - Then install any not-yet-installed that are apps listed          #
 #                                                                    #
-# IMPORTANT: Be sure to remove / comment any apps you do not want!   #
+# The following flag parameters are accepted:                        #
+#   --prompt-before-each - Ask for user confirmation for each app    #
+#   --dry-run - Run script, but without making changes to disk       #
+#   --auto-yes - Don't prompt for any user input, use with care      #
+#   --help - Print usage instructions / help menu, then exit         #
 #                                                                    #
+# IMPORTANT: Be sure to remove / comment any apps you do not want!   #
+# For docs and more info, see: https://github.com/lissy93/dotfiles   #
+######################################################################
 # Licensed under MIT (C) Alicia Sykes 2022 <https://aliciasykes.com> #
 ######################################################################
 
 # Remote origin to use for installations
 flatpak_origin='flathub'
 
-# List of desktop apps to be installed via Flatpak
+# List of desktop apps to be installed (specified by app ID)
 flatpak_apps=(
 
   # Communication
@@ -77,7 +84,8 @@ flatpak_apps=(
   'com.belmoussaoui.Authenticator'  # OTP authenticator
   'org.cryptomator.Cryptomator'     # Encryption for cloud
   'org.standardnotes.standardnotes' # Encrypted synced notes
-  # Missing: Trewsorit, 1Password, EteSync, Veracrypt, Ledger
+  'com.onepassword.OnePassword'     # Password manager
+  # Missing: Trewsorit, EteSync, Veracrypt, Ledger
 )
 
 # Color Variables
@@ -89,9 +97,16 @@ GREEN='\033[0;32m'
 PURPLE='\033[0;35m'
 LIGHT='\x1b[2m'
 
+# Options
 PROMPT_TIMEOUT=15 # When user is prompted for input, skip after x seconds
+PARAMS=$* # User-specified parameters
 
-# Helper function to install Flatpak for users current distro
+if [[ $PARAMS == *"--auto-yes"* ]]; then
+  PROMPT_TIMEOUT=1
+  AUTO_YES=true
+fi
+
+# Helper function to install Flatpak (if not present) for users current distro
 function install_flatpak () {
   # Arch, Manjaro
   if hash "pacman" 2> /dev/null; then
@@ -110,46 +125,29 @@ function install_flatpak () {
     echo -e "${PURPLE}Installing Flatpak via Yum${RESET}"
     sudo yum install flatpak
   fi
-  echo -e "${PURPLE}Adding Flathub repo${RESET}"
-  flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 }
 
-# Ask user if they'd like to proceed, and exit if not
-echo -e "${CYAN_B}Would you like to install Flatpak desktop apps? (y/N)${RESET}\n"
-read -t $PROMPT_TIMEOUT -n 1 -r
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-  echo -e "${YELLOW}Skipping Flatpak installations..."
-  exit 0
-fi
+# Checks if a given app ($1) is already installed, otherwise installs it
+function install_app () {
+  app=$1
 
-echo -e "${CYAN_B}Starting Flatpak App Installation Script${RESET}"
-
-# Check that Flatpak is present, prompt to install or exit if not
-if ! hash flatpak 2> /dev/null; then
-  echo -e "${PURPLE}Flatpak isn't yet installed on your system${RESET}"
-  echo -e "${CYAN_B}Would you like to install Flatpak now?${RESET}\n"
-  read -t $PROMPT_TIMEOUT -n 1 -r
-  echo
-  if [[ $REPLY =~ ^[Yy]$ ]]; then
-    install_flatpak
-  else
-    echo -e "${YELLOW}Skipping Flatpak installations, as Flatpack not installed"
-    exit 0
+  # If --prompt-before-each is set, then ask user if they'd like to proceed
+  if [[ $PARAMS == *"--prompt-before-each"* ]]; then
+    echo -e -n "\n${CYAN_B}Would you like to install ${app}? (y/N) ${RESET}"
+    read -t 15 -n 1 -r
+    if [[ ! $REPLY =~ ^[Yy]$ ]] && [[ $AUTO_YES != true ]] ; then
+      echo -e "\n${YELLOW}[Skipping] ${LIGHT}${app}, rejected by user${RESET}"
+      return
+    fi
+    echo
   fi
-fi
 
-# Update currently installed apps
-echo -e "${PURPLE}Updating installed apps${RESET}"
-yes "" | flatpak update
-
-# Itterate over each app, check if already installed, otherwise install now
-echo -e "${PURPLE}Installing apps defined in manifest${RESET}"
-for app in ${flatpak_apps[@]}; do
+  # Process app ID, and grep for it in system
   app_name=$(echo $app | rev | cut -d "." -f1 | rev)
   is_in_flatpak=$(echo $(flatpak list --columns=ref | grep $app))
   is_in_pacman=$(echo $(pacman -Qk $(echo $app_name | tr 'A-Z' 'a-z') 2> /dev/null ))
   is_in_apt=$(echo $(dpkg -s $(echo $app_name | tr 'A-Z' 'a-z') 2> /dev/null ))
+
   # Check app not already installed via Flatpak
   if [ -n "$is_in_flatpak" ]; then
     echo -e "${YELLOW}[Skipping] ${LIGHT}${app_name} is already installed.${RESET}"
@@ -162,9 +160,62 @@ for app in ${flatpak_apps[@]}; do
   else
     # Install app using Flatpak
     echo -e "${GREEN}[Installing] ${LIGHT}Downloading ${app_name} (from ${flatpak_origin}).${RESET}"
+    if [[ $PARAMS == *"--dry-run"* ]]; then return; fi # Skip if --dry-run enabled
     flatpak install -y --noninteractive $flatpak_origin $app
-    echo
   fi
+}
+
+function print_usage () {
+  echo -e "${CYAN_B}Flatpak Linux Desktop App Installation and Update script${RESET}"
+  echo -e "${PURPLE}The following tasks will be completed:\n"\
+  "- Check Flatpak is installed correctly / prompt to install if not\n"\
+  "- Add the flathub repo, if not already present\n"\
+  "- Upgrade Flatpak, and update all exiting installed apps\n"\
+  "- Installs each app in the list (if not already present)\n"\
+  "${RESET}"
+}
+
+# Show help menu
+print_usage
+if [[ $PARAMS == *"--help"* ]]; then exit; fi
+
+# Ask user if they'd like to proceed, and exit if not
+echo -e "${CYAN_B}Would you like to install Flatpak desktop apps? (y/N)${RESET}\n"
+read -t $PROMPT_TIMEOUT -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]] && [[ $AUTO_YES != true ]] ; then
+  echo -e "${YELLOW}Skipping Flatpak installations..."
+  exit 0
+fi
+
+echo -e "${CYAN_B}Starting Flatpak App Installation Script${RESET}"
+
+# Check that Flatpak is present, prompt to install or exit if not
+if ! hash flatpak 2> /dev/null; then
+  echo -e "${PURPLE}Flatpak isn't yet installed on your system${RESET}"
+  echo -e "${CYAN_B}Would you like to install Flatpak now?${RESET}\n"
+  read -t $PROMPT_TIMEOUT -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]] || [[ $AUTO_YES = true ]] ; then
+    install_flatpak
+  else
+    echo -e "${YELLOW}Skipping Flatpak installations, as Flatpack not installed"
+    exit 0
+  fi
+fi
+
+# Add FlatHub as upstream repo, if not already present
+echo -e "${PURPLE}Adding Flathub repo${RESET}"
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+
+# Update currently installed apps
+echo -e "${PURPLE}Updating installed apps${RESET}"
+flatpak update --assumeyes --noninteractive
+
+# Install each app listed above (if not already installed)
+echo -e "${PURPLE}Installing apps defined in manifest${RESET}"
+for app in ${flatpak_apps[@]}; do
+  install_app $app
 done
 
 echo -e "${PURPLE}Finished processing Flatpak apps${RESET}"