Some cleanup of theme
Added screenshot