diff --git a/clean_files.txt b/clean_files.txt
index f4ab4b1969..b001976b3b 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -159,6 +159,7 @@ themes/modern
 themes/norbu
 themes/pete
 themes/powerline
+themes/powerline-naked
 themes/pure
 themes/purity
 
diff --git a/themes/powerline-naked/powerline-naked.base.bash b/themes/powerline-naked/powerline-naked.base.bash
index 27a75ca99f..7b310ce74c 100644
--- a/themes/powerline-naked/powerline-naked.base.bash
+++ b/themes/powerline-naked/powerline-naked.base.bash
@@ -26,7 +26,7 @@ function __powerline_left_segment() {
 	fi
 
 	#change here to cahnge fg color
-	LEFT_PROMPT+="$(set_color "${params[1]:-}" -)${pad_before_segment}${params[0]}${normal}"
+	LEFT_PROMPT+="$(set_color "${params[1]:-}" -)${pad_before_segment}${params[0]}${normal?}"
 	#seperator char color == current bg
 	LAST_SEGMENT_COLOR="${params[1]:-}"
 	((SEGMENTS_AT_LEFT += 1))
diff --git a/themes/powerline-naked/powerline-naked.theme.bash b/themes/powerline-naked/powerline-naked.theme.bash
index 2fb4137ef0..533763311f 100644
--- a/themes/powerline-naked/powerline-naked.theme.bash
+++ b/themes/powerline-naked/powerline-naked.theme.bash
@@ -1,17 +1,18 @@
-#!/usr/bin/env bash
-
-. "$BASH_IT/themes/powerline-naked/powerline-naked.base.bash"
+# shellcheck shell=bash
+# shellcheck disable=SC2034 # Expected behavior for themes.
+# shellcheck source-path=SCRIPTDIR/../powerline
+source "${BASH_IT?}/themes/powerline/powerline.base.bash"
 
 PROMPT_CHAR=${POWERLINE_PROMPT_CHAR:=""}
-POWERLINE_LEFT_SEPARATOR=${POWERLINE_LEFT_SEPARATOR:=""}
+: "${POWERLINE_LEFT_SEPARATOR:=""}"
 POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR=""
 
-POWERLINE_COMPACT=${POWERLINE_COMPACT:=0}
-POWERLINE_COMPACT_BEFORE_SEPARATOR=${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_AFTER_SEPARATOR=${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_BEFOR_FIRST_SEGMENT=${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_AFTER_LAST_SEGMENT=${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}
-POWERLINE_COMPACT_PROMPT=${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}
+: "${POWERLINE_COMPACT:=0}"
+: "${POWERLINE_COMPACT_BEFORE_SEPARATOR:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_AFTER_SEPARATOR:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT:=${POWERLINE_COMPACT}}"
+: "${POWERLINE_COMPACT_PROMPT:=${POWERLINE_COMPACT}}"
 
 USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=${POWERLINE_USER_INFO_COLOR:=240}
@@ -62,12 +63,12 @@ LAST_STATUS_THEME_PROMPT_COLOR=${POWERLINE_LAST_STATUS_COLOR:=124}
 
 CLOCK_THEME_PROMPT_COLOR=${POWERLINE_CLOCK_COLOR:=240}
 
-BATTERY_AC_CHAR=${BATTERY_AC_CHAR:="⚡"}
+: "${BATTERY_AC_CHAR:="⚡"}"
 BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=${POWERLINE_BATTERY_GOOD_COLOR:=70}
 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=${POWERLINE_BATTERY_LOW_COLOR:=208}
 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=${POWERLINE_BATTERY_CRITICAL_COLOR:=160}
 
-THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:="%H:%M:%S"}
+: "${THEME_CLOCK_FORMAT:="%H:%M:%S"}"
 
 IN_VIM_THEME_PROMPT_COLOR=${POWERLINE_IN_VIM_COLOR:=245}
 IN_VIM_THEME_PROMPT_TEXT=${POWERLINE_IN_VIM_TEXT:="vim"}
@@ -92,6 +93,6 @@ COMMAND_NUMBER_THEME_PROMPT_CHAR=${POWERLINE_COMMAND_NUMBER_CHAR:="#"}
 GCLOUD_THEME_PROMPT_COLOR=${POWERLINE_GCLOUD_COLOR:=161}
 GCLOUD_CHAR=${POWERLINE_GCLOUD_CHAR:="❲G❳ "}
 
-POWERLINE_PROMPT=${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}
+: "${POWERLINE_PROMPT:="user_info scm python_venv ruby node cwd"}"
 
 safe_append_prompt_command __powerline_prompt_command