* Fixing some issues in windows
* Simplifying theme