Improved theme loading