Redo themes a little