Fixes #1 - Removed themes as discussed