Small Theme fixes