Theme overhaul and new design