Move theme load somewhere else