Solar Theme fixes