fix bug, partial translate, theming