more theme changes and fixes