diff --git a/themes/l/fish_right_prompt.fish b/themes/l/fish_right_prompt.fish
new file mode 100644
index 0000000..68eb155
--- /dev/null
+++ b/themes/l/fish_right_prompt.fish
@@ -0,0 +1,28 @@
+# To show the right prompt please set
+# set fish_theme_l_right_prompt true (config.fish)
+
+if test "$fish_theme_l_right_prompt" = true
+
+  function _ruby_version
+    echo (command rbenv version-name | sed 's/\n//')
+  end
+
+  function _ruby_gemset
+    echo (command rbenv gemset active ^/dev/null | sed -e 's| global||')
+  end
+
+  function fish_right_prompt
+    set -l red (set_color red)
+    set -l normal (set_color normal)
+
+    set ruby_info $red(_ruby_version)
+
+    if [ (_ruby_gemset) ]
+      set -l ruby_gemset $red(_ruby_gemset)
+      set ruby_info "$ruby_info@$ruby_gemset"
+    end
+
+    echo -n -s $ruby_info $normal
+  end
+
+end
diff --git a/themes/l/readme.md b/themes/l/readme.md
index c1d9ad0..a5239f4 100644
--- a/themes/l/readme.md
+++ b/themes/l/readme.md
@@ -6,9 +6,19 @@ A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/m
 ![](http://f.cl.ly/items/2S25360U1p360E0D2u2g/3.png)
 ![](http://f.cl.ly/items/1w0s0Q3x3r2Z1F1l011k/4.png)
 
-
 #### Characteristics
 
 * Current branch
 * Dirty working directory
-* Working directory
\ No newline at end of file
+* Working directory
+
+Only if fish_theme_l_right_prompt variable is set true within config.fish
+
+```fish
+set fish_theme_l_right_prompt true
+```
+
+* Rbenv Ruby Version
+* Rbenv Ruby Gemset
+
+![](http://f.cl.ly/items/0f0k3o2L3y2q1L3g1R1X/5.png)
diff --git a/themes/lambda/README.md b/themes/lambda/README.md
deleted file mode 100644
index 21ba515..0000000
--- a/themes/lambda/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Lambda
-
-A theme inspired by [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/lambda.zsh-theme)'s [lambda](http://zshthem.es/screenshots/lambda.png) theme.
-
-![](http://f.cl.ly/items/0s2B1n3F0I31340E273G/Screen%20Shot%202015-02-05%20at%2010.50.06%20am.png)
-
-#### Characteristics
-
-* Working directory
-* Git branch and dirty state (if inside a git repo)
-* Rbenv Ruby Version
-* Rbenv Ruby Gemset
diff --git a/themes/lambda/fish_prompt.fish b/themes/lambda/fish_prompt.fish
deleted file mode 100644
index d2d07f4..0000000
--- a/themes/lambda/fish_prompt.fish
+++ /dev/null
@@ -1,40 +0,0 @@
-# name: lambda
-# ---------------
-# Based on oh-my-zsh lambda theme
-#
-# Display the following bits on the left:
-# - Working directory
-# - Git branch and dirty state (if inside a git repo)
-#
-# Display the following bits on the right:
-# - Rbenv Ruby Version
-# - Rbenv Ruby Gemset# - Current directory name
-
-function _git_branch_name
-  echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||')
-end
-
-function _is_git_dirty
-  echo (command git status -s --ignore-submodules=dirty ^/dev/null)
-end
-
-function fish_prompt
-  set -l blue (set_color blue)
-  set -l green (set_color green)
-  set -l normal (set_color normal)
-
-  set -l arrow "λ"
-  set -l cwd $blue(basename (prompt_pwd))
-
-  if [ (_git_branch_name) ]
-    set git_info $green(_git_branch_name)
-    set git_info ":$git_info"
-
-    if [ (_is_git_dirty) ]
-      set -l dirty "*"
-      set git_info "$git_info$dirty"
-    end
-  end
-
-  echo -n -s $cwd $git_info $normal ' ' $arrow ' '
-end
diff --git a/themes/lambda/fish_right_prompt.fish b/themes/lambda/fish_right_prompt.fish
deleted file mode 100644
index 79195fd..0000000
--- a/themes/lambda/fish_right_prompt.fish
+++ /dev/null
@@ -1,21 +0,0 @@
-function _ruby_version
-  echo (command rbenv version-name | sed 's/\n//')
-end
-
-function _ruby_gemset
-  echo (command rbenv gemset active ^/dev/null | sed -e 's| global||')
-end
-
-function fish_right_prompt
-  set -l red (set_color red)
-  set -l normal (set_color normal)
-
-  set ruby_info $red(_ruby_version)
-
-  if [ (_ruby_gemset) ]
-    set -l ruby_gemset $red(_ruby_gemset)
-    set ruby_info "$ruby_info@$ruby_gemset"
-  end
-
-  echo -n -s $ruby_info $normal
-end
diff --git a/themes/lambda/screenshot.png b/themes/lambda/screenshot.png
deleted file mode 100644
index 4261bf8..0000000
Binary files a/themes/lambda/screenshot.png and /dev/null differ