Merged in theme changes from two different idea phases