Theme default improvements