diff --git a/docs/index.rst b/docs/index.rst
index 7f4649e7..e5bc2667 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,8 +21,10 @@ Stop polluting your ``~/bin`` directory and your ``.bashrc`` file, fork/clone Ba
    commands/index
    custom
    themes
+   themes-list/index
    vcs_user
    misc
+   troubleshooting
    uninstalling
 
 
diff --git a/docs/themes-list/index.rst b/docs/themes-list/index.rst
new file mode 100644
index 00000000..e15cd313
--- /dev/null
+++ b/docs/themes-list/index.rst
@@ -0,0 +1,558 @@
+.. _list_of_themes:
+
+List of Themes
+==============
+
+Below is a list of most of the themes (with screenshots) that `bash-it <https://github.com/Bash-it/bash-it/>`_ ships with.
+
+Alphabetical List:
+------------------
+
+Bakke
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/bakke-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bakke-black.jpg
+   :alt: Bakke
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/bakke-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bakke-white.jpg
+   :alt: Bakke
+
+
+----
+
+BarbUk
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/BarbUk-black.png
+   :target: https://bash-it.github.io/bash-it/docs/images/BarbUk-black.png
+   :alt: BarbUk
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/BarbUk-white.png
+   :target: https://bash-it.github.io/bash-it/docs/images/BarbUk-white.png
+   :alt: BarbUk
+
+
+----
+
+Bobby
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/bobby-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bobby-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/bobby-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/bobby-white.jpg
+   :alt:
+
+
+----
+
+Brunton
+^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/brunton-black.png
+   :target: https://bash-it.github.io/bash-it/docs/images/brunton-black.png
+   :alt:
+
+
+----
+
+Candy
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/candy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/candy-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/candy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/candy-white.jpg
+   :alt:
+
+
+----
+
+Clean
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/clean-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/clean-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/clean-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/clean-white.jpg
+   :alt:
+
+
+----
+
+Demula
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/demula-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/demula-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/demula-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/demula-white.jpg
+   :alt:
+
+
+----
+
+DOS
+^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/dos-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/dos-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/dos-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/dos-white.jpg
+   :alt:
+
+
+----
+
+DoubleTime
+^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime-white.jpg
+   :alt:
+
+
+----
+
+DoubleTime Multiline
+^^^^^^^^^^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline-white.jpg
+   :alt:
+
+
+----
+
+Doubletime Multiline Python Only
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/doubletime_multiline_pyonly-white.jpg
+   :alt:
+
+
+----
+
+Envy
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/envy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/envy-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/envy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/envy-white.jpg
+   :alt:
+
+
+----
+
+Iterate
+^^^^^^^
+
+Responsively wraps prompt based on terminal width.
+
+
+.. image:: https://cloud.githubusercontent.com/assets/1319655/2923152/3a763194-d70e-11e3-9e52-3740de9bbb9b.png
+   :target: https://cloud.githubusercontent.com/assets/1319655/2923152/3a763194-d70e-11e3-9e52-3740de9bbb9b.png
+   :alt:
+
+
+.. image:: https://cloud.githubusercontent.com/assets/1319655/2923143/14b8e0d2-d70e-11e3-9706-f5341fff8e5c.png
+   :target: https://cloud.githubusercontent.com/assets/1319655/2923143/14b8e0d2-d70e-11e3-9706-f5341fff8e5c.png
+   :alt:
+
+
+----
+
+Mr Briggs
+^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/mbriggs-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/mbriggs-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/mbriggs-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/mbriggs-white.jpg
+   :alt:
+
+
+----
+
+Minimal
+^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/minimal-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/minimal-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/minimal-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/minimal-white.jpg
+   :alt:
+
+
+----
+
+Modern
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-white.jpg
+   :alt:
+
+
+----
+
+Modern T
+^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-t-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-t-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/modern-t-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/modern-t-white.jpg
+   :alt:
+
+
+----
+
+Metal
+^^^^^
+
+
+.. image:: https://raw.githubusercontent.com/jrab66/bash-it/7cc82b518d6286fc68c8477d809ce9f417501976/themes/metal/metalthemeblack.png
+   :target: https://raw.githubusercontent.com/jrab66/bash-it/7cc82b518d6286fc68c8477d809ce9f417501976/themes/metal/metalthemeblack.png
+   :alt:
+
+
+----
+
+n0Qorg
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/n0qorg-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/n0qorg-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/n0qorg-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/n0qorg-white.jpg
+   :alt:
+
+
+----
+
+NWinkler
+^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/nwinkler-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/nwinkler-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/nwinkler-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/nwinkler-white.jpg
+   :alt:
+
+
+----
+
+Pete
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/pete-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pete-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/pete-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pete-white.jpg
+   :alt:
+
+
+----
+
+Powerline
+^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-white.jpg
+   :alt:
+
+
+----
+
+Powerline Naked
+^^^^^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-naked-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-naked-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-naked-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-naked-white.jpg
+   :alt:
+
+
+----
+
+Powerline Plain
+^^^^^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-plain-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-plain-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/powerline-plain-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/powerline-plain-white.jpg
+   :alt:
+
+
+----
+
+Pure
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/pure-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pure-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/pure-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/pure-white.jpg
+   :alt:
+
+
+----
+
+RainbowBrite
+^^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rainbowbrite-white.jpg
+   :alt:
+
+
+----
+
+R Jorgenson
+^^^^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/rjorgenson-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rjorgenson-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/rjorgenson-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/rjorgenson-white.jpg
+   :alt:
+
+
+----
+
+Sexy
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/sexy-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sexy-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/sexy-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sexy-white.jpg
+   :alt:
+
+
+----
+
+Simple
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/simple-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/simple-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/simple-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/simple-white.jpg
+   :alt:
+
+
+----
+
+SirUp
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/sirup-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sirup-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/sirup-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/sirup-white.jpg
+   :alt:
+
+
+----
+
+Standard
+^^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/standard-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/standard-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/standard-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/standard-white.jpg
+   :alt:
+
+
+----
+
+Tonka
+^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/tonka-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tonka-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/tonka-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tonka-white.jpg
+   :alt:
+
+
+----
+
+Tylenol
+^^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/tylenol-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tylenol-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/tylenol-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/tylenol-white.jpg
+   :alt:
+
+
+----
+
+Zitron
+^^^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/zitron-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zitron-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/zitron-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zitron-white.jpg
+   :alt:
+
+
+----
+
+Zork
+^^^^
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/zork-black.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zork-black.jpg
+   :alt:
+
+
+.. image:: https://bash-it.github.io/bash-it/docs/images/zork-white.jpg
+   :target: https://bash-it.github.io/bash-it/docs/images/zork-white.jpg
+   :alt:
diff --git a/docs/themes.rst b/docs/themes.rst
index 27b93a29..aa21a7e3 100644
--- a/docs/themes.rst
+++ b/docs/themes.rst
@@ -29,6 +29,41 @@ You can see theme screenshots on `wiki/Themes <https://github.com/Bash-it/bash-i
 
 **NOTE**\ : Bash-it and some themes use UTF-8 characters, so to avoid strange behavior in your terminal, set your locale to ``LC_ALL=en_US.UTF-8`` or the equivalent to your language if it isn't American English.
 
+List of Themes
+^^^^^^^^^^^^^^
+
+See :ref:`here <list_of_themes>`.
+
+Theme Switches & Variables
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Clock Related
+=============
+
+function: ``clock_char``
+########################
+
+Prints a character indicating clock.
+
+
+* ``THEME_SHOW_CLOCK_CHAR`` : **true**\ /false
+
+* ``THEME_CLOCK_CHAR`` : "\ **⌚**\ "
+
+* ``THEME_CLOCK_CHAR_COLOR`` : "\ **$normal**\ "
+
+function: ``clock_prompt``
+##########################
+
+Prints the clock prompt (date, time).
+
+
+* ``THEME_SHOW_CLOCK`` : **true**\ /false
+
+* ``THEME_CLOCK_COLOR`` :  "\ **$normal**\ "
+
+* ``THEME_CLOCK_FORMAT`` : "\ **%H:%M:%S**\ "
+
 Contributing a new theme
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
new file mode 100644
index 00000000..6503699a
--- /dev/null
+++ b/docs/troubleshooting.rst
@@ -0,0 +1,16 @@
+.. _troubleshooting:
+
+Troubleshooting Guide
+=====================
+
+Table of Contents
+-----------------
+
+* `I'm stuck in the LightDM login screen after setting up bash-it. <im-stuck-in-the-lightdm-login-screen-after-setting-up-bash-it>`_
+
+I'm stuck in the LightDM login screen after setting up bash-it
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Possible issue**\ : `#672 <https://github.com/Bash-it/bash-it/issues/672>`_
+
+**Solution**\ : Check `this comment <https://github.com/Bash-it/bash-it/issues/672#issuecomment-257870653>`_ for detailed information about the cause and solution for this issue.