Removed theme-default dependency