Basic Themes (no target range settings) AND #99

Basic Themes + #99