Tweaked the WM themes
Minor fixes
Merge pull request #22 from shimmerproject/master

Various changes