Start of ove to new API. Added themes, fixed properties
, fixed + tweaks