more theme changes, editor fix