Clean-up and theme improvements