Cathys branch

Attempt to move new theme updates to master.