diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0eee145c..1d1c0eca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11]
+        os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11]
 
     runs-on: ${{ matrix.os }}
 
diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index b4934489..2511aab8 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -71,10 +71,6 @@ alias rd='rmdir'
 # Shorten extract
 alias xt='extract'
 
-# sudo editors
-alias svim='sudo ${VISUAL:-vim}'
-alias snano='sudo nano'
-
 # Display whatever file is regular file or folder
 function catt() {
 	for i in "$@"; do
diff --git a/clean_files.txt b/clean_files.txt
index de0f6c1e..192fefa6 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -46,6 +46,7 @@ completion/available/dmidecode.completion.bash
 completion/available/docker-machine.completion.bash
 completion/available/docker.completion.bash
 completion/available/dotnet.completion.bash
+completion/available/flutter.completion.bash
 completion/available/gcloud.completion.bash
 completion/available/gem.completion.bash
 completion/available/git.completion.bash
diff --git a/completion/available/flutter.completion.bash b/completion/available/flutter.completion.bash
index 62befc82..7dde5a07 100644
--- a/completion/available/flutter.completion.bash
+++ b/completion/available/flutter.completion.bash
@@ -1,5 +1,5 @@
-#!/usr/bin/bash
+# shellcheck shell=bash
 
 if _command_exists flutter; then
-  eval "$(flutter bash-completion)"
+	eval "$(flutter bash-completion)"
 fi
diff --git a/completion/available/projects.completion.bash b/completion/available/projects.completion.bash
index 90735ee1..df4f5754 100644
--- a/completion/available/projects.completion.bash
+++ b/completion/available/projects.completion.bash
@@ -7,7 +7,7 @@ _is_function _rl_enabled ||
 _pj() {
   _is_function _init_completion || return
   _is_function _rl_enabled || return
-  [ -n "$PROJECT_PATHS" ] || return
+  [ -n "$BASH_IT_PROJECT_PATHS" ] || return
   shift
   [ "$1" == "open" ] && shift
 
@@ -21,7 +21,7 @@ _pj() {
   local -r mark_dirs=$(_rl_enabled mark-directories && echo y)
   local -r mark_symdirs=$(_rl_enabled mark-symlinked-directories && echo y)
 
-  for i in ${PROJECT_PATHS//:/$'\n'}; do
+  for i in ${BASH_IT_PROJECT_PATHS//:/$'\n'}; do
     # create an array of matched subdirs
     k="${#COMPREPLY[@]}"
     for j in $( compgen -d $i/$cur ); do
diff --git a/plugins/available/dirs.plugin.bash b/plugins/available/dirs.plugin.bash
index 34468fa0..55d2e88a 100644
--- a/plugins/available/dirs.plugin.bash
+++ b/plugins/available/dirs.plugin.bash
@@ -63,12 +63,15 @@ function dirs-help() {
 if [[ -f "${BASH_IT_DIRS_BKS?}" ]]; then
 	# shellcheck disable=SC1090
 	source "${BASH_IT_DIRS_BKS?}"
-elif [[ -f ~/.dirs ]]; then
-	mv -vn ~/.dirs "${BASH_IT_DIRS_BKS?}"
-	# shellcheck disable=SC1090
-	source "${BASH_IT_DIRS_BKS?}"
 else
-	touch "${BASH_IT_DIRS_BKS?}"
+	mkdir -p "${BASH_IT_DIRS_BKS%/*}"
+	if [[ -f ~/.dirs ]]; then
+		mv -vn ~/.dirs "${BASH_IT_DIRS_BKS?}"
+		# shellcheck disable=SC1090
+		source "${BASH_IT_DIRS_BKS?}"
+	else
+		touch "${BASH_IT_DIRS_BKS?}"
+	fi
 fi
 
 alias L='cat "${BASH_IT_DIRS_BKS?}"'