diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 34c609d58..121d7d8b8 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1420,7 +1420,7 @@ class MeshService : Service(), Logging {
     }
 
     private fun requestAllConfig() {
-        AdminProtos.AdminMessage.ConfigType.values().filter {
+        AdminProtos.AdminMessage.ConfigType.entries.filter {
             it != AdminProtos.AdminMessage.ConfigType.UNRECOGNIZED
         }.forEach(::requestConfig)
     }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index 5e6aa2416..7db520873 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -379,7 +379,7 @@ fun ChannelScreen(
         item {
             DropDownPreference(title = stringResource(id = R.string.channel_options),
                 enabled = enabled,
-                items = ChannelOption.values()
+                items = ChannelOption.entries
                     .map { it.modemPreset to stringResource(it.configRes) },
                 selectedItem = channelSet.loraConfig.modemPreset,
                 onItemSelected = {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 089c32a8a..666c46b70 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -235,7 +235,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
     }
 
     /// the sorted list of region names like arrayOf("US", "CN", "EU488")
-    private val regions = ConfigProtos.Config.LoRaConfig.RegionCode.values().filter {
+    private val regions = ConfigProtos.Config.LoRaConfig.RegionCode.entries.filter {
         it != ConfigProtos.Config.LoRaConfig.RegionCode.UNRECOGNIZED
     }.map {
         it.name
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
index 39e69fd93..3a85c1c09 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
@@ -124,7 +124,7 @@ inline fun <reified T> EditListPreference(
                 DropDownPreference(
                     title = "Type",
                     enabled = enabled,
-                    items = RemoteHardwarePinType.values()
+                    items = RemoteHardwarePinType.entries
                         .filter { it != RemoteHardwarePinType.UNRECOGNIZED }
                         .map { it to it.name },
                     selectedItem = value.type,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
index 1c7b01b0a..1bcd8a3c1 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
@@ -53,7 +53,7 @@ fun AudioConfigItemList(
         item {
             DropDownPreference(title = "CODEC2 sample rate",
                 enabled = enabled,
-                items = AudioConfig.Audio_Baud.values()
+                items = AudioConfig.Audio_Baud.entries
                     .filter { it != AudioConfig.Audio_Baud.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = audioInput.bitrate,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
index d685a9530..d33958668 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
@@ -45,7 +45,7 @@ fun BluetoothConfigItemList(
         item {
             DropDownPreference(title = "Pairing mode",
                 enabled = enabled,
-                items = BluetoothConfig.PairingMode.values()
+                items = BluetoothConfig.PairingMode.entries
                     .filter { it != BluetoothConfig.PairingMode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = bluetoothInput.mode,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
index c6bad9b12..d5b6653a5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
@@ -92,7 +92,7 @@ fun CannedMessageConfigItemList(
         item {
             DropDownPreference(title = "Generate input event on Press",
                 enabled = enabled,
-                items = CannedMessageConfig.InputEventChar.values()
+                items = CannedMessageConfig.InputEventChar.entries
                     .filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = cannedMessageInput.inputbrokerEventPress,
@@ -105,7 +105,7 @@ fun CannedMessageConfigItemList(
         item {
             DropDownPreference(title = "Generate input event on CW",
                 enabled = enabled,
-                items = CannedMessageConfig.InputEventChar.values()
+                items = CannedMessageConfig.InputEventChar.entries
                     .filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = cannedMessageInput.inputbrokerEventCw,
@@ -118,7 +118,7 @@ fun CannedMessageConfigItemList(
         item {
             DropDownPreference(title = "Generate input event on CCW",
                 enabled = enabled,
-                items = CannedMessageConfig.InputEventChar.values()
+                items = CannedMessageConfig.InputEventChar.entries
                     .filter { it != CannedMessageConfig.InputEventChar.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = cannedMessageInput.inputbrokerEventCcw,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
index 9fd9ccae5..f37a972a2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
@@ -37,7 +37,7 @@ fun DeviceConfigItemList(
         item {
             DropDownPreference(title = "Role",
                 enabled = enabled,
-                items = DeviceConfig.Role.values()
+                items = DeviceConfig.Role.entries
                     .filter { it != DeviceConfig.Role.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = deviceInput.role,
@@ -84,7 +84,7 @@ fun DeviceConfigItemList(
         item {
             DropDownPreference(title = "Rebroadcast mode",
                 enabled = enabled,
-                items = DeviceConfig.RebroadcastMode.values()
+                items = DeviceConfig.RebroadcastMode.entries
                     .filter { it != DeviceConfig.RebroadcastMode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = deviceInput.rebroadcastMode,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
index f256145f8..d9ab2fae5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
@@ -45,7 +45,7 @@ fun DisplayConfigItemList(
         item {
             DropDownPreference(title = "GPS coordinates format",
                 enabled = enabled,
-                items = DisplayConfig.GpsCoordinateFormat.values()
+                items = DisplayConfig.GpsCoordinateFormat.entries
                     .filter { it != DisplayConfig.GpsCoordinateFormat.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = displayInput.gpsFormat,
@@ -82,7 +82,7 @@ fun DisplayConfigItemList(
         item {
             DropDownPreference(title = "Display units",
                 enabled = enabled,
-                items = DisplayConfig.DisplayUnits.values()
+                items = DisplayConfig.DisplayUnits.entries
                     .filter { it != DisplayConfig.DisplayUnits.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = displayInput.units,
@@ -93,7 +93,7 @@ fun DisplayConfigItemList(
         item {
             DropDownPreference(title = "Override OLED auto-detect",
                 enabled = enabled,
-                items = DisplayConfig.OledType.values()
+                items = DisplayConfig.OledType.entries
                     .filter { it != DisplayConfig.OledType.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = displayInput.oled,
@@ -104,7 +104,7 @@ fun DisplayConfigItemList(
         item {
             DropDownPreference(title = "Display mode",
                 enabled = enabled,
-                items = DisplayConfig.DisplayMode.values()
+                items = DisplayConfig.DisplayMode.entries
                     .filter { it != DisplayConfig.DisplayMode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = displayInput.displaymode,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
index 4a48d2608..889ef2dc0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
@@ -52,7 +52,7 @@ fun LoRaConfigItemList(
             item {
                 DropDownPreference(title = "Modem preset",
                     enabled = enabled && loraInput.usePreset,
-                    items = LoRaConfig.ModemPreset.values()
+                    items = LoRaConfig.ModemPreset.entries
                         .filter { it != LoRaConfig.ModemPreset.UNRECOGNIZED }
                         .map { it to it.name },
                     selectedItem = loraInput.modemPreset,
@@ -96,7 +96,7 @@ fun LoRaConfigItemList(
         item {
             DropDownPreference(title = "Region (frequency plan)",
                 enabled = enabled,
-                items = LoRaConfig.RegionCode.values()
+                items = LoRaConfig.RegionCode.entries
                     .filter { it != LoRaConfig.RegionCode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = loraInput.region,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
index e0c56d294..a06345069 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
@@ -112,7 +112,7 @@ fun NetworkConfigItemList(
         item {
             DropDownPreference(title = "IPv4 mode",
                 enabled = enabled,
-                items = NetworkConfig.AddressMode.values()
+                items = NetworkConfig.AddressMode.entries
                     .filter { it != NetworkConfig.AddressMode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = networkInput.addressMode,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
index 8a47a97e7..3e427c3aa 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
@@ -149,7 +149,7 @@ fun PositionConfigItemList(
             BitwisePreference(title = "Position flags",
                 value = positionInput.positionFlags,
                 enabled = enabled,
-                items = ConfigProtos.Config.PositionConfig.PositionFlags.values()
+                items = ConfigProtos.Config.PositionConfig.PositionFlags.entries
                     .filter { it != PositionConfig.PositionFlags.UNSET && it != PositionConfig.PositionFlags.UNRECOGNIZED }
                     .map { it.number to it.name },
                 onItemSelected = { positionInput = positionInput.copy { positionFlags = it } }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
index 9a45ddd55..3104178f4 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
@@ -69,7 +69,7 @@ fun SerialConfigItemList(
         item {
             DropDownPreference(title = "Serial baud rate",
                 enabled = enabled,
-                items = SerialConfig.Serial_Baud.values()
+                items = SerialConfig.Serial_Baud.entries
                     .filter { it != SerialConfig.Serial_Baud.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = serialInput.baud,
@@ -88,7 +88,7 @@ fun SerialConfigItemList(
         item {
             DropDownPreference(title = "Serial mode",
                 enabled = enabled,
-                items = SerialConfig.Serial_Mode.values()
+                items = SerialConfig.Serial_Mode.entries
                     .filter { it != SerialConfig.Serial_Mode.UNRECOGNIZED }
                     .map { it to it.name },
                 selectedItem = serialInput.mode,