Improved theme load functions