Add a moon/sun button beside the rail's Add icon that flips this device between light and dark, stored under the same theme key the theme picker and ThemeInitScript read. Following the device stays on Settings > General, since the toggle is always an explicit choice.