Big cleanup, hopefully size reduction. Made interface consistent, even if you use themes (might still be places where this is not true)