Fix for issue #791
Small Theme fixes
Merge pull request #805 from sylus/master

Theme Adjustment + Bug Fix