Theme work
* rounded corners, conflict fixes