more theme customization tweaks, lots more TODO