Theme Tweaks

Greater theme ability