Custom Theme bugfixes.