Themes: Updated and fixes