cleanup theme and units to sync with master