Improved theme and bindings