Consolidate both themes