diff --git a/bash_it.sh b/bash_it.sh
index 00a1bcea..ddc02b70 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -51,8 +51,6 @@ if [[ -n "${BASH_IT_THEME:-}" ]]; then
 	source "${BASH_IT}/themes/githelpers.theme.bash"
 	BASH_IT_LOG_PREFIX="themes: p4helpers: "
 	source "${BASH_IT}/themes/p4helpers.theme.bash"
-	BASH_IT_LOG_PREFIX="themes: command_duration: "
-	source "${BASH_IT}/themes/command_duration.theme.bash"
 	BASH_IT_LOG_PREFIX="themes: base: "
 	source "${BASH_IT}/themes/base.theme.bash"
 
diff --git a/clean_files.txt b/clean_files.txt
index 36bdc08c..e52d5a9f 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -78,6 +78,7 @@ completion/available/wpscan.completion.bash
 # libraries
 lib/appearance.bash
 lib/colors.bash
+lib/command_duration.bash
 lib/helpers.bash
 lib/history.bash
 lib/log.bash
@@ -155,7 +156,6 @@ themes/bobby-python
 themes/brainy
 themes/brunton
 themes/candy
-themes/command_duration.theme.bash
 themes/easy
 themes/essential
 themes/githelpers.theme.bash
diff --git a/themes/command_duration.theme.bash b/lib/command_duration.bash
similarity index 100%
rename from themes/command_duration.theme.bash
rename to lib/command_duration.bash
diff --git a/test/plugins/cmd-returned-notify.plugin.bats b/test/plugins/cmd-returned-notify.plugin.bats
index 7399d6e1..e712cbd9 100644
--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@@ -3,8 +3,7 @@
 load "${MAIN_BASH_IT_DIR?}/test/test_helper.bash"
 
 function local_setup_file() {
-  setup_libs "preexec" #"command_duration"
-  load ../../themes/command_duration.theme
+  setup_libs "command_duration"
   load "${BASH_IT?}/plugins/available/cmd-returned-notify.plugin.bash"
 }