Improved version checking
Drop ThemeAsset support