Moved all themes into contextPath/themes; Added ToolBar control