Revert "Change to incorporated theme" - Needed too much extra Ruby to work

This reverts commit 58bf0312a2eda728fa6ce3051920956d75231f70.