Improved Theme Usage