Re-add theme support