Theme tweaks
Re-organize and simplify some bits