sort package imports and complete BaseTheme definition for overrides