Improved support for themes running on various OS's