diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index 6667a6724..c3a6cf073 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -45,7 +45,7 @@ alias gcp='git cherry-pick'
 alias history='fc -l 1'
 
 # List direcory contents
-alias ls='ls -F'
+alias ls='ls -F -G'
 alias lsa='ls -lahG'
 alias l='ls -la'
 alias ll='ls -alr'
diff --git a/lib/appearance.zsh b/lib/appearance.zsh
new file mode 100644
index 000000000..b1f5a8a38
--- /dev/null
+++ b/lib/appearance.zsh
@@ -0,0 +1,34 @@
+# Colors
+autoload colors; colors;
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+
+#setopt no_beep
+setopt auto_cd
+setopt multios
+setopt cdablevarS
+
+if [[ x$WINDOW != x ]]
+then
+    SCREEN_NO="%B$WINDOW%b "
+else
+    SCREEN_NO=""
+fi
+
+# Apply theming defaults
+PS1="%n@%m:%~%# "
+
+# git theming default: Variables for theming the git info prompt
+# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("
+# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_DIRTY="*"
+# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Setup the prompt with pretty colors
+setopt prompt_subst
+
+# Load the theme
+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
\ No newline at end of file
diff --git a/lib/colors.zsh b/lib/colors.zsh
deleted file mode 100644
index b2b08f929..000000000
--- a/lib/colors.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-autoload colors; colors;
-
-unset LSCOLORS
-export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
diff --git a/lib/git.zsh b/lib/git.zsh
index 9409c92db..84a3af0b9 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,14 +1,3 @@
-# Varables for themeing the git info prompt:
-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
-
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
-ZSH_THEME_GIT_PROMPT_CLEAN=""
-
 # get the name of the branch we are on
 function git_prompt_info() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || return
diff --git a/lib/misc.zsh b/lib/misc.zsh
index a01627d9e..4c1743657 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -7,3 +7,7 @@ bindkey "^[m" copy-prev-shell-word
 
 ## jobs
 setopt long_list_jobs
+
+## pager
+export PAGER=less
+export LC_CTYPE=en_US.UTF-8
diff --git a/lib/prompt.zsh b/lib/prompt.zsh
deleted file mode 100644
index 39689684f..000000000
--- a/lib/prompt.zsh
+++ /dev/null
@@ -1,25 +0,0 @@
-export PAGER=less
-export LC_CTYPE=en_US.UTF-8
-
-# speed stuff.
-
-#setopt no_beep
-setopt auto_cd
-setopt multios
-setopt cdablevarS
-
-if [[ x$WINDOW != x ]]
-then
-    SCREEN_NO="%B$WINDOW%b "
-else
-    SCREEN_NO=""
-fi
-
-PS1="%n@%m:%~%# "
-
-# Setup the prompt with pretty colors
-setopt prompt_subst
-
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
-
-source "$ZSH/themes/$ZSH_THEME.zsh-theme"