fixes for orbit and themebase

fixes for orbit and themebase