diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
index 87e5c852..0a0e9522 100644
--- a/Meshtastic.xcodeproj/project.pbxproj
+++ b/Meshtastic.xcodeproj/project.pbxproj
@@ -1570,7 +1570,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.24;
+				MARKETING_VERSION = 2.2.25;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1604,7 +1604,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.24;
+				MARKETING_VERSION = 2.2.25;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = YES;
@@ -1726,7 +1726,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.24;
+				MARKETING_VERSION = 2.2.25;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1759,7 +1759,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.24;
+				MARKETING_VERSION = 2.2.25;
 				PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Meshtastic/Views/Settings/Config/PowerConfig.swift b/Meshtastic/Views/Settings/Config/PowerConfig.swift
index dd7de037..ae3536cd 100644
--- a/Meshtastic/Views/Settings/Config/PowerConfig.swift
+++ b/Meshtastic/Views/Settings/Config/PowerConfig.swift
@@ -1,249 +1,249 @@
-//import SwiftUI
-//
-//struct PowerConfig: View {
-//	@Environment(\.managedObjectContext) private var context
-//	@EnvironmentObject private var bleManager: BLEManager
-//	@Environment(\.dismiss) private var goBack
-//
-//	let node: NodeInfoEntity?
-//
-//	@State private var isPowerSaving = false
-//
-//	@State private var shutdownOnPowerLoss = false
-//	@State private var shutdownAfterSecs = 0
-//	@State private var adcOverride = false
-//	@State private var adcMultiplier: Float = 0.0
-//
-//	@State private var waitBluetoothSecs = 60
-//	@State private var lsSecs = 300
-//	@State private var minWakeSecs = 10
-//	
-//	@State private var currentDevice: DeviceHardware?
-//	
-//	@State private var hasChanges: Bool = false
-//	@FocusState private var isFocused: Bool
-//
-//	var body: some View {
-//		Form {
-//			ConfigHeader(title: "Power", config: \.powerConfig, node: node, onAppear: setPowerValues)
-//
-//			Section {
-//				if currentDevice?.architecture == .esp32 || currentDevice?.architecture == .esp32S3 {
-//					Toggle(isOn: $isPowerSaving) {
-//						Label("Power Saving", systemImage: "bolt")
-//						Text("Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.")
-//					}
-//					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-//				}
-//				Toggle(isOn: $shutdownOnPowerLoss) {
-//					Label("power.shutdown.on.power.loss", systemImage: "power")
-//				}
-//				.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-//				if shutdownOnPowerLoss {
-//					Picker("power.shutdown.after.secs", selection: $shutdownAfterSecs) {
-//						ForEach(PowerIntervals.allCases) { at in
-//							Text(at.description)
+import SwiftUI
+
+struct PowerConfig: View {
+	@Environment(\.managedObjectContext) private var context
+	@EnvironmentObject private var bleManager: BLEManager
+	@Environment(\.dismiss) private var goBack
+
+	let node: NodeInfoEntity?
+
+	@State private var isPowerSaving = false
+
+	@State private var shutdownOnPowerLoss = false
+	@State private var shutdownAfterSecs = 0
+	@State private var adcOverride = false
+	@State private var adcMultiplier: Float = 0.0
+
+	@State private var waitBluetoothSecs = 60
+	@State private var lsSecs = 300
+	@State private var minWakeSecs = 10
+	
+	@State private var currentDevice: DeviceHardware?
+	
+	@State private var hasChanges: Bool = false
+	@FocusState private var isFocused: Bool
+
+	var body: some View {
+		Form {
+			ConfigHeader(title: "Power", config: \.powerConfig, node: node, onAppear: setPowerValues)
+
+			Section {
+				if currentDevice?.architecture == .esp32 || currentDevice?.architecture == .esp32S3 {
+					Toggle(isOn: $isPowerSaving) {
+						Label("Power Saving", systemImage: "bolt")
+						Text("Will sleep everything as much as possible, for the tracker and sensor role this will also include the lora radio. Don't use this setting if you want to use your device with the phone apps or are using a device without a user button.")
+					}
+					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+				}
+				Toggle(isOn: $shutdownOnPowerLoss) {
+					Label("power.shutdown.on.power.loss", systemImage: "power")
+				}
+				.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+				if shutdownOnPowerLoss {
+					Picker("power.shutdown.after.secs", selection: $shutdownAfterSecs) {
+						ForEach(PowerIntervals.allCases) { at in
+							Text(at.description)
+						}
+					}
+					.pickerStyle(DefaultPickerStyle())
+				}
+			} header: {
+				Text("power")
+			}
+			if currentDevice?.architecture == .esp32 || currentDevice?.architecture == .esp32S3 {
+				Section {
+					Toggle(isOn: $adcOverride) {
+						Text("power.adc.override")
+					}
+					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
+
+					if adcOverride {
+						HStack {
+							Text("power.adc.multiplier")
+							Spacer()
+							FloatField(title: "power.adc.multiplier", number: $adcMultiplier) {
+								(2.0 ... 6.0).contains($0)
+							}
+							.focused($isFocused)
+							Spacer()
+						}
+					}
+				} header: {
+					Text("Battery")
+				}
+//				Section {
+//					Picker("power.wait.bluetooth.secs", selection: $waitBluetoothSecs) {
+//						ForEach(PowerIntervals.allCases) {
+//							Text($0.description)
 //						}
 //					}
 //					.pickerStyle(DefaultPickerStyle())
-//				}
-//			} header: {
-//				Text("power")
-//			}
-//			if currentDevice?.architecture == .esp32 || currentDevice?.architecture == .esp32S3 {
-//				Section {
-//					Toggle(isOn: $adcOverride) {
-//						Text("power.adc.override")
-//					}
-//					.toggleStyle(SwitchToggleStyle(tint: .accentColor))
-//
-//					if adcOverride {
-//						HStack {
-//							Text("power.adc.multiplier")
-//							Spacer()
-//							FloatField(title: "power.adc.multiplier", number: $adcMultiplier) {
-//								(2.0 ... 6.0).contains($0)
-//							}
-//							.focused($isFocused)
-//							Spacer()
+//					
+//					Picker("power.ls.secs", selection: $lsSecs) {
+//						ForEach(PowerIntervals.allCases) {
+//							Text($0.description)
 //						}
 //					}
-//				} header: {
-//					Text("Battery")
-//				}
-////				Section {
-////					Picker("power.wait.bluetooth.secs", selection: $waitBluetoothSecs) {
-////						ForEach(PowerIntervals.allCases) {
-////							Text($0.description)
-////						}
-////					}
-////					.pickerStyle(DefaultPickerStyle())
-////					
-////					Picker("power.ls.secs", selection: $lsSecs) {
-////						ForEach(PowerIntervals.allCases) {
-////							Text($0.description)
-////						}
-////					}
-////					.pickerStyle(DefaultPickerStyle())
-////					
-////					Picker("power.min.wake.secs", selection: $minWakeSecs) {
-////						ForEach(PowerIntervals.allCases) {
-////							Text($0.description)
-////						}
-////					}
-////					.pickerStyle(DefaultPickerStyle())
-////					
-////				} header: {
-////					Text("Sleep")
-////				}
-//			}
-//		}
-//		.disabled(self.bleManager.connectedPeripheral == nil || node?.powerConfig == nil)
-//		.navigationTitle("power.config")
-//		.navigationBarItems(trailing: ZStack {
-//			ConnectedDevice(
-//				bluetoothOn: bleManager.isSwitchedOn,
-//				deviceConnected: bleManager.connectedPeripheral != nil,
-//				name: "\(bleManager.connectedPeripheral?.shortName ?? "?")"
-//			)
-//		})
-//		.toolbar {
-//			ToolbarItemGroup(placement: .keyboard) {
-//				Spacer()
-//				Button("dismiss.keyboard") {
-//					isFocused = false
-//				}
-//				.font(.subheadline)
-//			}
-//		}
-//		.onAppear {
-//			if self.bleManager.context == nil {
-//				self.bleManager.context = context
-//			}
-//			
-//			Api().loadDeviceHardwareData { (hw) in
-//				for device in hw {
-//					let currentHardware = node?.user?.hwModel ?? "UNSET"
-//					let deviceString = device.hwModelSlug.replacingOccurrences(of: "_", with: "")
-//					if deviceString == currentHardware  {
-//						currentDevice = device
+//					.pickerStyle(DefaultPickerStyle())
+//					
+//					Picker("power.min.wake.secs", selection: $minWakeSecs) {
+//						ForEach(PowerIntervals.allCases) {
+//							Text($0.description)
+//						}
 //					}
+//					.pickerStyle(DefaultPickerStyle())
+//					
+//				} header: {
+//					Text("Sleep")
 //				}
-//			}
-//			setPowerValues()
-//
-//			// Need to request a Power config from the remote node before allowing changes
-//			if bleManager.connectedPeripheral != nil && node?.powerConfig == nil {
-//				let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context)
-//				if node != nil && connectedNode != nil {
-//					_ = bleManager.requestPowerConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
-//				}
-//			}
-//		}
-//		.onChange(of: isPowerSaving) {
-//			if let val = node?.powerConfig?.isPowerSaving {
-//				hasChanges = $0 != val
-//			}
-//		}
-//		.onChange(of: shutdownOnPowerLoss) { _ in
-//			hasChanges = true
-//		}
-//		.onChange(of: shutdownAfterSecs) {
-//			if let val = node?.powerConfig?.onBatteryShutdownAfterSecs {
-//				hasChanges = $0 != val
-//			}
-//		}
-//		.onChange(of: adcOverride) { _ in
-//			hasChanges = true
-//		}
-//		.onChange(of: adcMultiplier) {
-//			if let val = node?.powerConfig?.adcMultiplierOverride {
-//				hasChanges = $0 != val
-//			}
-//		}
-//		.onChange(of: waitBluetoothSecs) {
-//			if let val = node?.powerConfig?.waitBluetoothSecs {
-//				hasChanges = $0 != val
-//			}
-//		}
-//		.onChange(of: lsSecs) {
-//			if let val = node?.powerConfig?.lsSecs {
-//				hasChanges = $0 != val
-//			}
-//		}
-//		.onChange(of: minWakeSecs) {
-//			if let val = node?.powerConfig?.minWakeSecs {
-//				hasChanges = $0 != val
-//			}
-//		}
-//
-//		SaveConfigButton(node: node, hasChanges: $hasChanges) {
-//			guard let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context),
-//				  let fromUser = connectedNode.user,
-//				  let toUser = node?.user else {
-//				return
-//			}
-//
-//			var config = Config.PowerConfig()
-//			config.isPowerSaving = isPowerSaving
-//			config.onBatteryShutdownAfterSecs = shutdownOnPowerLoss ? UInt32(shutdownAfterSecs) : 0
-//			config.adcMultiplierOverride = adcOverride ? adcMultiplier : 0
-//			config.waitBluetoothSecs = UInt32(waitBluetoothSecs)
-//			config.lsSecs = UInt32(lsSecs)
-//			config.minWakeSecs = UInt32(minWakeSecs)
-//
-//			let adminMessageId = bleManager.savePowerConfig(
-//				config: config,
-//				fromUser: fromUser,
-//				toUser: toUser,
-//				adminIndex: connectedNode.myInfo?.adminIndex ?? 0
-//			)
-//			if adminMessageId > 0 {
-//				// Should show a saved successfully alert once I know that to be true
-//				// for now just disable the button after a successful save
-//				hasChanges = false
-//				goBack()
-//			}
-//		}
-//	}
-//
-//	private func setPowerValues() {
-//		isPowerSaving = node?.powerConfig?.isPowerSaving ?? isPowerSaving
-//
-//		shutdownAfterSecs = Int(node?.powerConfig?.onBatteryShutdownAfterSecs ?? Int32(shutdownAfterSecs))
-//		shutdownOnPowerLoss = shutdownAfterSecs != 0
-//
-//		adcMultiplier = node?.powerConfig?.adcMultiplierOverride ?? adcMultiplier
-//		adcOverride = adcMultiplier != 0
-//
-//		waitBluetoothSecs = Int(node?.powerConfig?.waitBluetoothSecs ?? Int32(waitBluetoothSecs))
-//		lsSecs = Int(node?.powerConfig?.lsSecs ?? Int32(lsSecs))
-//		minWakeSecs = Int(node?.powerConfig?.minWakeSecs ?? Int32(minWakeSecs))
-//	}
-//}
-//
-///// Helper view for isolating user float input that can be validated before being applied.
-//private struct FloatField: View {
-//	let title: String
-//	@Binding var number: Float
-//	var isValid: (Float) -> Bool = { _ in true }
-//
-//	@State private var typingNumber: Float = 0.0
-//
-//	var body: some View {
-//		TextField(title.localized, value: $typingNumber, format: .number)
-//			.foregroundColor(.gray)
-//			.multilineTextAlignment(.trailing)
-//			.onChange(of: typingNumber, perform: { _ in
-//				if isValid(typingNumber) {
-//					number = typingNumber
-//				} else {
-//					typingNumber = number
-//				}
-//			})
-//			.keyboardType(.decimalPad)
-//			.onAppear {
-//				typingNumber = number
-//			}
-//	}
-//}
+			}
+		}
+		.disabled(self.bleManager.connectedPeripheral == nil || node?.powerConfig == nil)
+		.navigationTitle("power.config")
+		.navigationBarItems(trailing: ZStack {
+			ConnectedDevice(
+				bluetoothOn: bleManager.isSwitchedOn,
+				deviceConnected: bleManager.connectedPeripheral != nil,
+				name: "\(bleManager.connectedPeripheral?.shortName ?? "?")"
+			)
+		})
+		.toolbar {
+			ToolbarItemGroup(placement: .keyboard) {
+				Spacer()
+				Button("dismiss.keyboard") {
+					isFocused = false
+				}
+				.font(.subheadline)
+			}
+		}
+		.onAppear {
+			if self.bleManager.context == nil {
+				self.bleManager.context = context
+			}
+			
+			Api().loadDeviceHardwareData { (hw) in
+				for device in hw {
+					let currentHardware = node?.user?.hwModel ?? "UNSET"
+					let deviceString = device.hwModelSlug.replacingOccurrences(of: "_", with: "")
+					if deviceString == currentHardware  {
+						currentDevice = device
+					}
+				}
+			}
+			setPowerValues()
+
+			// Need to request a Power config from the remote node before allowing changes
+			if bleManager.connectedPeripheral != nil && node?.powerConfig == nil {
+				let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? 0, context: context)
+				if node != nil && connectedNode != nil {
+					_ = bleManager.requestPowerConfig(fromUser: connectedNode!.user!, toUser: node!.user!, adminIndex: connectedNode?.myInfo?.adminIndex ?? 0)
+				}
+			}
+		}
+		.onChange(of: isPowerSaving) {
+			if let val = node?.powerConfig?.isPowerSaving {
+				hasChanges = $0 != val
+			}
+		}
+		.onChange(of: shutdownOnPowerLoss) { _ in
+			hasChanges = true
+		}
+		.onChange(of: shutdownAfterSecs) {
+			if let val = node?.powerConfig?.onBatteryShutdownAfterSecs {
+				hasChanges = $0 != val
+			}
+		}
+		.onChange(of: adcOverride) { _ in
+			hasChanges = true
+		}
+		.onChange(of: adcMultiplier) {
+			if let val = node?.powerConfig?.adcMultiplierOverride {
+				hasChanges = $0 != val
+			}
+		}
+		.onChange(of: waitBluetoothSecs) {
+			if let val = node?.powerConfig?.waitBluetoothSecs {
+				hasChanges = $0 != val
+			}
+		}
+		.onChange(of: lsSecs) {
+			if let val = node?.powerConfig?.lsSecs {
+				hasChanges = $0 != val
+			}
+		}
+		.onChange(of: minWakeSecs) {
+			if let val = node?.powerConfig?.minWakeSecs {
+				hasChanges = $0 != val
+			}
+		}
+
+		SaveConfigButton(node: node, hasChanges: $hasChanges) {
+			guard let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral.num, context: context),
+				  let fromUser = connectedNode.user,
+				  let toUser = node?.user else {
+				return
+			}
+
+			var config = Config.PowerConfig()
+			config.isPowerSaving = isPowerSaving
+			config.onBatteryShutdownAfterSecs = shutdownOnPowerLoss ? UInt32(shutdownAfterSecs) : 0
+			config.adcMultiplierOverride = adcOverride ? adcMultiplier : 0
+			config.waitBluetoothSecs = UInt32(waitBluetoothSecs)
+			config.lsSecs = UInt32(lsSecs)
+			config.minWakeSecs = UInt32(minWakeSecs)
+
+			let adminMessageId = bleManager.savePowerConfig(
+				config: config,
+				fromUser: fromUser,
+				toUser: toUser,
+				adminIndex: connectedNode.myInfo?.adminIndex ?? 0
+			)
+			if adminMessageId > 0 {
+				// Should show a saved successfully alert once I know that to be true
+				// for now just disable the button after a successful save
+				hasChanges = false
+				goBack()
+			}
+		}
+	}
+
+	private func setPowerValues() {
+		isPowerSaving = node?.powerConfig?.isPowerSaving ?? isPowerSaving
+
+		shutdownAfterSecs = Int(node?.powerConfig?.onBatteryShutdownAfterSecs ?? Int32(shutdownAfterSecs))
+		shutdownOnPowerLoss = shutdownAfterSecs != 0
+
+		adcMultiplier = node?.powerConfig?.adcMultiplierOverride ?? adcMultiplier
+		adcOverride = adcMultiplier != 0
+
+		waitBluetoothSecs = Int(node?.powerConfig?.waitBluetoothSecs ?? Int32(waitBluetoothSecs))
+		lsSecs = Int(node?.powerConfig?.lsSecs ?? Int32(lsSecs))
+		minWakeSecs = Int(node?.powerConfig?.minWakeSecs ?? Int32(minWakeSecs))
+	}
+}
+
+/// Helper view for isolating user float input that can be validated before being applied.
+private struct FloatField: View {
+	let title: String
+	@Binding var number: Float
+	var isValid: (Float) -> Bool = { _ in true }
+
+	@State private var typingNumber: Float = 0.0
+
+	var body: some View {
+		TextField(title.localized, value: $typingNumber, format: .number)
+			.foregroundColor(.gray)
+			.multilineTextAlignment(.trailing)
+			.onChange(of: typingNumber, perform: { _ in
+				if isValid(typingNumber) {
+					number = typingNumber
+				} else {
+					typingNumber = number
+				}
+			})
+			.keyboardType(.decimalPad)
+			.onAppear {
+				typingNumber = number
+			}
+	}
+}
diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift
index bf9b7a8a..c05335cd 100644
--- a/Meshtastic/Views/Settings/Settings.swift
+++ b/Meshtastic/Views/Settings/Settings.swift
@@ -224,14 +224,14 @@ struct Settings: View {
 						}
 						.tag(SettingsSidebar.positionConfig)
 
-//						NavigationLink {
-//							PowerConfig(node: nodes.first(where: { $0.num == selectedNode }))
-//						} label: {
-//							Image(systemName: "bolt.fill")
-//								.symbolRenderingMode(.hierarchical)
-//							Text("power")
-//						}
-//						.tag(SettingsSidebar.powerConfig)
+						NavigationLink {
+							PowerConfig(node: nodes.first(where: { $0.num == selectedNode }))
+						} label: {
+							Image(systemName: "bolt.fill")
+								.symbolRenderingMode(.hierarchical)
+							Text("power")
+						}
+						.tag(SettingsSidebar.powerConfig)
 					}
 					Section("module.configuration") {
 						if #available(iOS 17.0, macOS 14.0, *) {