diff --git a/meta/argument_spec.yml b/meta/argument_spec.yml
index 569e41e..27f4db8 100644
--- a/meta/argument_spec.yml
+++ b/meta/argument_spec.yml
@@ -9,33 +9,50 @@ argument_specs:
     author:
       - Matthew Stobbs <matthew@stobbs.ca>
     options:
-      use_local:
-        type: bool
-        default: true
-        required: false
-        description:
-          Install packages using the current users
-          `$HOME/.local` directory as the install prefix.
-
-          When `false`, uses the system wide `/usr/local`
-          as the install prefix, and stores other parts
-          (appimages, extracted archives, cache) in the
-          appropriate path starting with `/opt`.
       packages:
         type: list
         elements: str
         required: true
-        description: |
-            The list of packages to install by name.
-            The list must contain only values that exist in
-            `Available Packages` in `README.md`
-      prefer_method:
+        description:
+          - The list of packages to install by name.
+          - The list must contain only values that exist in B(Available Packages) in README.md
+      extra_packages:
+        type: list
+        elements: str
+        description:
+          - Extra system packages by installation name to install using the system package manager
+      default_flatpak_method:
+        type: str
+        default: system
+        description:
+          - Default installation method for flatpaks.
+          - Possible values are 'system' and 'user'
+      default_install_method:
         type: str
-        required: false
         default: system
         choices:
-          - flatpak
-          - langtool
-          - snap
-          - source
           - system
+          - source
+          - appimage
+          - flatpak
+          - cask
+          - snap
+        description:
+          - Default installation method for packages.
+          - Varies between each indivdual package, but this is for overall package installation.
+          - Possible values are V(system), V(source), V(appimage), V(flatpak), V(cask), V(snap)
+      default_install_prefix:
+        type: path
+        default: /usr/local
+        description:
+          - Default installation prefix when installation non-system packages.
+      path_suffix_appimage:
+        type: path
+        default: "{{ default_install_prefix }}/appimage"
+        description:
+          - Where appimage files are stored.
+      path_suffix_archive:
+        type: path
+        default: "{{ default_install_prefix }}/archive"
+        description:
+          - Where archives are downloaded and extracted.
diff --git a/vars/main.yml b/vars/main.yml
index 02c5cc0..df22908 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,33 +1,23 @@
 # vim: set filetype=yaml.ansible :
 # variables used in ansible_role_package
 ---
-default_flatpak_method: system # possible values are 'system' and 'user'
-default_install_method: package # possible values are 'package', 'source', 'appimage'
+default_flatpak_method: system
+default_install_method: system
 default_install_prefix: /usr/local
 debug: false
-use_local: false
 packages: [] # list of packages to install
 extra_packages: [] # list of extra packages to add to pkg_sys
 
-paths:
-  suffix:
-    appimage: "/appimage" # keep appimages in `{{ default_install_prefix }}/appimage`
-    archive: "/archive" # extract archives to `{{ default_install_prefix }}/archive`
-    bin: "/bin" # installation prefix. Binaries are placed in `{{ default_install_prefix }}/bin`
-    cargo: "/cargo" # cargo install location `{{ default_install_prefix }}/cargo`
-    go: "/go" # GOROOT `{{ default_install_prefix }}/go`
-    pipx: "/pipx" # where pipx environments are installed `{{ default_install_prefix }}/pipx`
+# Path suffixes for installation types. Prefixed by `default_install_prefix`
+path_suffix_appimage: appimage
+path_suffix_archive: archive
+path_suffix_bin: bin
+path_suffix_cargo: cargo
+path_suffix_go: go
+path_suffix_pipx: pipx
+path_suffix_source: source
 
-# paths resolve to either $HOME/.local as the prefix, or /usr/local
-# all created paths are named:
-# - paths.appimage: $PREFIX/appimage
-# - paths.archive: $PREFIX/archive
-# - paths.bin: $PREFIX/bin
-# - paths.cargo: $PREFIX/cargo
-# - paths.go: $PREFIX/go
-# - paths.pipx: $PREFIX/pipx
-
-package_default_clean_src: false
+default_clean_source: false
 
 ## Extra config that usually will not need to be changed
 hyprgitbase: https://github.com/hyprwm