Add categories "Clock & date" and "Options", cleanup