Removed defaults for theme properties (MERGE WITH PR#2039)

Added CGRect to themes