misc changes in binds, themes and org