Code cleanup; theme tweaks.
Merge pull request #3 from teknoids/master

Code cleanup; theme tweaks.