Tidy bindings
Move stuff arround
More theme additions