diff --git a/FileSets/v3.30~8/relaystate.py b/FileSets/PatchSource/relaystate.py.edited
similarity index 84%
rename from FileSets/v3.30~8/relaystate.py
rename to FileSets/PatchSource/relaystate.py.edited
index 3e5501a..be57792 100644
--- a/FileSets/v3.30~8/relaystate.py
+++ b/FileSets/PatchSource/relaystate.py.edited
@@ -21,15 +21,16 @@ def get_input(self):
 			('com.victronenergy.settings', [
 				 '/Settings/Relay/Function'])] # Managed by the gui
 
+#### add relays 3 - 6 for RpiGpioSetup
 	def get_settings(self):
 		return [
-            ('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
-            ('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
-            ('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
-            ('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
-            ('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
-            ('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
-            ('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
+			('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
+			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
+			('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
+			('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
+			('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
+			('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
+			('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
 		]
 
 	@property
diff --git a/FileSets/PatchSource/relaystate.py.patch b/FileSets/PatchSource/relaystate.py.patch
new file mode 100644
index 0000000..be7deba
--- /dev/null
+++ b/FileSets/PatchSource/relaystate.py.patch
@@ -0,0 +1,20 @@
+--- /Users/Kevin/GitHub/RpiGpioSetup/FileSets/PatchSource/relaystate.py.source	2024-02-23 09:55:27
++++ /Users/Kevin/GitHub/RpiGpioSetup/FileSets/PatchSource/relaystate.py.edited	2024-02-23 22:32:14
+@@ -21,10 +21,16 @@
+ 			('com.victronenergy.settings', [
+ 				 '/Settings/Relay/Function'])] # Managed by the gui
+ 
++#### add relays 3 - 6 for RpiGpioSetup
+ 	def get_settings(self):
+ 		return [
+ 			('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
+-			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1)
++			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
++			('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
++			('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
++			('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
++			('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
++			('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
+ 		]
+ 
+ 	@property
diff --git a/FileSets/v3.30~8/relaystate.py.orig b/FileSets/PatchSource/relaystate.py.source
similarity index 100%
rename from FileSets/v3.30~8/relaystate.py.orig
rename to FileSets/PatchSource/relaystate.py.source
diff --git a/FileSets/VenusGpioOverlay.dtbo b/FileSets/VersionIndependent/VenusGpioOverlay.dtbo
similarity index 100%
rename from FileSets/VenusGpioOverlay.dtbo
rename to FileSets/VersionIndependent/VenusGpioOverlay.dtbo
diff --git a/FileSets/VenusGpioOverlayForCanHats.dtbo b/FileSets/VersionIndependent/VenusGpioOverlayForCanHats.dtbo
similarity index 100%
rename from FileSets/VenusGpioOverlayForCanHats.dtbo
rename to FileSets/VersionIndependent/VenusGpioOverlayForCanHats.dtbo
diff --git a/FileSets/fileList b/FileSets/fileListPatched
similarity index 100%
rename from FileSets/fileList
rename to FileSets/fileListPatched
diff --git a/FileSets/fileListVersionIndependent b/FileSets/fileListVersionIndependent
index 5a1a520..93b0286 100644
--- a/FileSets/fileListVersionIndependent
+++ b/FileSets/fileListVersionIndependent
@@ -1 +1,3 @@
-/u-boot/overlays/spi1-1cs.dtbo
\ No newline at end of file
+/u-boot/overlays/spi1-1cs.dtbo
+/u-boot/overlays/VenusGpioOverlay.dtbo
+/u-boot/overlays/VenusGpioOverlayForCanHats.dtbo
\ No newline at end of file
diff --git a/FileSets/v2.71/COMPLETE b/FileSets/v2.71/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.71/LINKS_ONLY b/FileSets/v2.71/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.71/relaystate.py b/FileSets/v2.71/relaystate.py
deleted file mode 120000
index deb7063..0000000
--- a/FileSets/v2.71/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v2.73/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.72/COMPLETE b/FileSets/v2.72/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.72/LINKS_ONLY b/FileSets/v2.72/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.72/relaystate.py b/FileSets/v2.72/relaystate.py
deleted file mode 120000
index deb7063..0000000
--- a/FileSets/v2.72/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v2.73/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.73/COMPLETE b/FileSets/v2.73/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.73/relaystate.py b/FileSets/v2.73/relaystate.py
deleted file mode 100644
index c77abf9..0000000
--- a/FileSets/v2.73/relaystate.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import gobject
-import logging
-import os
-import traceback
-from glob import glob
-
-# Victron packages
-from ve_utils import exit_on_error
-
-from delegates.base import SystemCalcDelegate
-
-class RelayState(SystemCalcDelegate):
-	RELAY_GLOB = '/dev/gpio/relay_*'
-
-	def __init__(self):
-		SystemCalcDelegate.__init__(self)
-		self._relays = {}
-
-	def get_input(self):
-		return [
-			('com.victronenergy.settings', [
-				 '/Settings/Relay/Function'])] # Managed by the gui
-
-	def get_settings(self):
-		return [
-            ('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
-            ('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1),
-            ('/Relay/2/State', '/Settings/Relay/2/InitialState', 0, 0, 1),
-            ('/Relay/3/State', '/Settings/Relay/3/InitialState', 0, 0, 1),
-            ('/Relay/4/State', '/Settings/Relay/4/InitialState', 0, 0, 1),
-            ('/Relay/5/State', '/Settings/Relay/5/InitialState', 0, 0, 1),
-            ('/Relay/6/State', '/Settings/Relay/6/InitialState', 0, 0, 1)
-		]
-
-	@property
-	def relay_function(self):
-		return self._dbusmonitor.get_value('com.victronenergy.settings',
-			'/Settings/Relay/Function')
-
-	def set_sources(self, dbusmonitor, settings, dbusservice):
-		SystemCalcDelegate.set_sources(self, dbusmonitor, settings, dbusservice)
-		relays = sorted(glob(self.RELAY_GLOB))
-
-		if len(relays) == 0:
-			logging.info('No relays found')
-			return
-
-		self._relays.update({'/Relay/{}/State'.format(i): os.path.join(r, 'value') \
-			for i, r in enumerate(relays) })
-
-		gobject.idle_add(exit_on_error, self._init_relay_state)
-		for dbus_path in self._relays.iterkeys():
-			self._dbusservice.add_path(dbus_path, value=None, writeable=True,
-				onchangecallback=self._on_relay_state_changed)
-
-		logging.info('Relays found: {}'.format(', '.join(self._relays.values())))
-
-	def _init_relay_state(self):
-		if self.relay_function is None:
-			return True # Try again on the next idle event
-
-		for dbus_path, path in self._relays.iteritems():
-			if self.relay_function != 2 and dbus_path == '/Relay/0/State':
-				continue # Skip primary relay if function is not manual
-			try:
-				state = self._settings[dbus_path]
-			except KeyError:
-				pass
-			else:
-				self._dbusservice[dbus_path] = state
-				self.__on_relay_state_changed(dbus_path, state)
-
-		# Sync state back to dbus
-		self._update_relay_state()
-
-		# Watch changes and update dbus. Do we still need this?
-		gobject.timeout_add(5000, exit_on_error, self._update_relay_state)
-		return False
-
-	def _update_relay_state(self):
-		# @todo EV Do we still need this? Maybe only at startup?
-		for dbus_path, file_path in self._relays.items():
-			try:
-				with open(file_path, 'rt') as r:
-					state = int(r.read().strip())
-					self._dbusservice[dbus_path] = state
-			except (IOError, ValueError):
-				traceback.print_exc()
-		return True
-
-	def __on_relay_state_changed(self, dbus_path, state):
-		try:
-			path = self._relays[dbus_path]
-			with open(path, 'wt') as w:
-				w.write(str(state))
-		except IOError:
-			traceback.print_exc()
-			return False
-		return True
-
-	def _on_relay_state_changed(self, dbus_path, value):
-		try:
-			state = int(bool(value))
-		except ValueError:
-			traceback.print_exc()
-			return False
-		try:
-			return self.__on_relay_state_changed(dbus_path, state)
-		finally:
-			# Remember the state to restore after a restart
-			self._settings[dbus_path] = state
diff --git a/FileSets/v2.73/relaystate.py.orig b/FileSets/v2.73/relaystate.py.orig
deleted file mode 100644
index 6815da8..0000000
--- a/FileSets/v2.73/relaystate.py.orig
+++ /dev/null
@@ -1,106 +0,0 @@
-import gobject
-import logging
-import os
-import traceback
-from glob import glob
-
-# Victron packages
-from ve_utils import exit_on_error
-
-from delegates.base import SystemCalcDelegate
-
-class RelayState(SystemCalcDelegate):
-	RELAY_GLOB = '/dev/gpio/relay_*'
-
-	def __init__(self):
-		SystemCalcDelegate.__init__(self)
-		self._relays = {}
-
-	def get_input(self):
-		return [
-			('com.victronenergy.settings', [
-				 '/Settings/Relay/Function'])] # Managed by the gui
-
-	def get_settings(self):
-		return [
-			('/Relay/0/State', '/Settings/Relay/0/InitialState', 0, 0, 1),
-			('/Relay/1/State', '/Settings/Relay/1/InitialState', 0, 0, 1)
-		]
-
-	@property
-	def relay_function(self):
-		return self._dbusmonitor.get_value('com.victronenergy.settings',
-			'/Settings/Relay/Function')
-
-	def set_sources(self, dbusmonitor, settings, dbusservice):
-		SystemCalcDelegate.set_sources(self, dbusmonitor, settings, dbusservice)
-		relays = sorted(glob(self.RELAY_GLOB))
-
-		if len(relays) == 0:
-			logging.info('No relays found')
-			return
-
-		self._relays.update({'/Relay/{}/State'.format(i): os.path.join(r, 'value') \
-			for i, r in enumerate(relays) })
-
-		gobject.idle_add(exit_on_error, self._init_relay_state)
-		for dbus_path in self._relays.iterkeys():
-			self._dbusservice.add_path(dbus_path, value=None, writeable=True,
-				onchangecallback=self._on_relay_state_changed)
-
-		logging.info('Relays found: {}'.format(', '.join(self._relays.values())))
-
-	def _init_relay_state(self):
-		if self.relay_function is None:
-			return True # Try again on the next idle event
-
-		for dbus_path, path in self._relays.iteritems():
-			if self.relay_function != 2 and dbus_path == '/Relay/0/State':
-				continue # Skip primary relay if function is not manual
-			try:
-				state = self._settings[dbus_path]
-			except KeyError:
-				pass
-			else:
-				self._dbusservice[dbus_path] = state
-				self.__on_relay_state_changed(dbus_path, state)
-
-		# Sync state back to dbus
-		self._update_relay_state()
-
-		# Watch changes and update dbus. Do we still need this?
-		gobject.timeout_add(5000, exit_on_error, self._update_relay_state)
-		return False
-
-	def _update_relay_state(self):
-		# @todo EV Do we still need this? Maybe only at startup?
-		for dbus_path, file_path in self._relays.items():
-			try:
-				with open(file_path, 'rt') as r:
-					state = int(r.read().strip())
-					self._dbusservice[dbus_path] = state
-			except (IOError, ValueError):
-				traceback.print_exc()
-		return True
-
-	def __on_relay_state_changed(self, dbus_path, state):
-		try:
-			path = self._relays[dbus_path]
-			with open(path, 'wt') as w:
-				w.write(str(state))
-		except IOError:
-			traceback.print_exc()
-			return False
-		return True
-
-	def _on_relay_state_changed(self, dbus_path, value):
-		try:
-			state = int(bool(value))
-		except ValueError:
-			traceback.print_exc()
-			return False
-		try:
-			return self.__on_relay_state_changed(dbus_path, state)
-		finally:
-			# Remember the state to restore after a restart
-			self._settings[dbus_path] = state
diff --git a/FileSets/v2.80/COMPLETE b/FileSets/v2.80/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.80/LINKS_ONLY b/FileSets/v2.80/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.80/relaystate.py b/FileSets/v2.80/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.80/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.81/COMPLETE b/FileSets/v2.81/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.81/LINKS_ONLY b/FileSets/v2.81/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.81/relaystate.py b/FileSets/v2.81/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.81/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.82/COMPLETE b/FileSets/v2.82/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.82/LINKS_ONLY b/FileSets/v2.82/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.82/relaystate.py b/FileSets/v2.82/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.82/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.83/COMPLETE b/FileSets/v2.83/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.83/LINKS_ONLY b/FileSets/v2.83/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.83/relaystate.py b/FileSets/v2.83/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.83/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.84/COMPLETE b/FileSets/v2.84/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.84/LINKS_ONLY b/FileSets/v2.84/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.84/relaystate.py b/FileSets/v2.84/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.84/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.85/COMPLETE b/FileSets/v2.85/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.85/LINKS_ONLY b/FileSets/v2.85/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.85/relaystate.py b/FileSets/v2.85/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.85/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.86/COMPLETE b/FileSets/v2.86/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.86/LINKS_ONLY b/FileSets/v2.86/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.86/relaystate.py b/FileSets/v2.86/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.86/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.87/COMPLETE b/FileSets/v2.87/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.87/LINKS_ONLY b/FileSets/v2.87/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.87/relaystate.py b/FileSets/v2.87/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.87/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.89/COMPLETE b/FileSets/v2.89/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.89/LINKS_ONLY b/FileSets/v2.89/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.89/relaystate.py b/FileSets/v2.89/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.89/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.90/COMPLETE b/FileSets/v2.90/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.90/LINKS_ONLY b/FileSets/v2.90/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.90/relaystate.py b/FileSets/v2.90/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.90/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.91/COMPLETE b/FileSets/v2.91/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.91/LINKS_ONLY b/FileSets/v2.91/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.91/relaystate.py b/FileSets/v2.91/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.91/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.92/COMPLETE b/FileSets/v2.92/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.92/LINKS_ONLY b/FileSets/v2.92/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.92/relaystate.py b/FileSets/v2.92/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.92/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.93/COMPLETE b/FileSets/v2.93/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.93/LINKS_ONLY b/FileSets/v2.93/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.93/relaystate.py b/FileSets/v2.93/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.93/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v2.94/COMPLETE b/FileSets/v2.94/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.94/LINKS_ONLY b/FileSets/v2.94/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v2.94/relaystate.py b/FileSets/v2.94/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v2.94/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.00/COMPLETE b/FileSets/v3.00/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.00/LINKS_ONLY b/FileSets/v3.00/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.00/relaystate.py b/FileSets/v3.00/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.00/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.00~32/COMPLETE b/FileSets/v3.00~32/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.00~32/LINKS_ONLY b/FileSets/v3.00~32/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.00~32/relaystate.py b/FileSets/v3.00~32/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.00~32/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.01/COMPLETE b/FileSets/v3.01/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.01/LINKS_ONLY b/FileSets/v3.01/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.01/relaystate.py b/FileSets/v3.01/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.01/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.10/COMPLETE b/FileSets/v3.10/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.10/LINKS_ONLY b/FileSets/v3.10/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.10/relaystate.py b/FileSets/v3.10/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.10/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.11/COMPLETE b/FileSets/v3.11/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.11/LINKS_ONLY b/FileSets/v3.11/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.11/relaystate.py b/FileSets/v3.11/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.11/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.12/COMPLETE b/FileSets/v3.12/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.12/LINKS_ONLY b/FileSets/v3.12/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.12/relaystate.py b/FileSets/v3.12/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.12/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.13/COMPLETE b/FileSets/v3.13/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.13/LINKS_ONLY b/FileSets/v3.13/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.13/relaystate.py b/FileSets/v3.13/relaystate.py
deleted file mode 120000
index 667f504..0000000
--- a/FileSets/v3.13/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.20~34/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.14/COMPLETE b/FileSets/v3.14/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.14/LINKS_ONLY b/FileSets/v3.14/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.14/relaystate.py b/FileSets/v3.14/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.14/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.20/COMPLETE b/FileSets/v3.20/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.20/LINKS_ONLY b/FileSets/v3.20/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.20/relaystate.py b/FileSets/v3.20/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.20/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.21/COMPLETE b/FileSets/v3.21/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.21/LINKS_ONLY b/FileSets/v3.21/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.21/relaystate.py b/FileSets/v3.21/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.21/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.30~3/COMPLETE b/FileSets/v3.30~3/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~3/LINKS_ONLY b/FileSets/v3.30~3/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~3/relaystate.py b/FileSets/v3.30~3/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.30~3/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.30~4/COMPLETE b/FileSets/v3.30~4/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~4/LINKS_ONLY b/FileSets/v3.30~4/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~4/relaystate.py b/FileSets/v3.30~4/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.30~4/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.30~6/COMPLETE b/FileSets/v3.30~6/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~6/LINKS_ONLY b/FileSets/v3.30~6/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~6/relaystate.py b/FileSets/v3.30~6/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.30~6/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.30~7/COMPLETE b/FileSets/v3.30~7/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~7/LINKS_ONLY b/FileSets/v3.30~7/LINKS_ONLY
deleted file mode 100644
index e69de29..0000000
diff --git a/FileSets/v3.30~7/relaystate.py b/FileSets/v3.30~7/relaystate.py
deleted file mode 120000
index b74c713..0000000
--- a/FileSets/v3.30~7/relaystate.py
+++ /dev/null
@@ -1 +0,0 @@
-../v3.30~8/relaystate.py
\ No newline at end of file
diff --git a/FileSets/v3.30~8/COMPLETE b/FileSets/v3.30~8/COMPLETE
deleted file mode 100644
index e69de29..0000000
diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
index 0ff74a6..fc853c2 100755
--- a/HelperResources/CommonResources
+++ b/HelperResources/CommonResources
@@ -1253,13 +1253,6 @@ fi
 versionStringToNumber $venusVersion
 venusVersionNumber=$versionNumber
 
-# create obsolete version file if it does not already exist
-#	accommodates previous mechanism that used shell varaible
-if [ ! -z $obsoleteVersion ] && [ ! -f "$scriptDir/obsoleteVersion" ]; then
-	echo $obsoleteVersion > "$scriptDir/obsoleteVersion"
-fi
-
-
 # prevent installing Raspberry Pi packages on other platforms
 if [ -f "$scriptDir/raspberryPiOnly" ]; then 
 	if [[ $machine != *"raspberrypi"* ]]; then
@@ -1298,6 +1291,9 @@ fi
 #	do final checks before permitting install
 if [ $scriptAction != 'UNINSTALL' ]; then
 
+	# check for package conflicts and prevent installs if there are any
+	###################################
+
 	# determine if GUI v1 is installed
 	#	Note, it may NOT be running or selected to run!!!!
 	if [ ! -d "/opt/victronenergy/gui" ]; then
diff --git a/PI GPIO pins.numbers b/PI GPIO pins.numbers
new file mode 100755
index 0000000..5fc3f4f
Binary files /dev/null and b/PI GPIO pins.numbers differ
diff --git a/PI GPIO pins.pdf b/PI GPIO pins.pdf
new file mode 100644
index 0000000..335987a
Binary files /dev/null and b/PI GPIO pins.pdf differ
diff --git a/changes b/changes
index 2253b68..5411550 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,8 @@
+v4.6:
+	fixed: v4.5 had corrupted file sets (v2.73 and maybe others)
+	cleanup overlay install
+	move to version-independent and patched replacements
+
 v4.5:
 	install spi1-1cs overlay for use in VeCanSetup for CANbus hats that use spi1
 		spi1-3cd conflicts with Shutdown pin
diff --git a/setup b/setup
index ca56cbf..0c8c2f1 100755
--- a/setup
+++ b/setup
@@ -34,8 +34,6 @@
 # Note, this script DOES require a system reboot.
 
 gpioListFile="/etc/venus/gpio_list"
-overlayFile="/u-boot/overlays/VenusGpioOverlay.dtbo"
-altOverlayFile="/u-boot/overlays/VenusGpioOverlayForCanHats.dtbo"
 configFile="/u-boot/config.txt"
 
 # no log file for this package
@@ -131,13 +129,11 @@ if [ $scriptAction == 'INSTALL' ] ; then
 	# install / update GPIO overlay
 	# there are two overlays, make sure the "other" one is removed from config.txt
 	if [ -f "$setupOptionsDir/alternateGpio" ]; then
-		updateActiveFile "$altOverlayFile"
 		gpioOverlay="VenusGpioOverlayForCanHats"
 		if [ $(grep -c "VenusGpioOverlay" "$configFile") == 0 ]; then
             sed -i -e '/#### change all digital inputs to pull ups/,/#### end change all digital inputs to pull ups/d' "$configFile"
 		fi
 	else
-		updateActiveFile "$overlayFile"
 		gpioOverlay="VenusGpioOverlay"
 		if [ $(grep -c "VenusGpioOverlayForCanHats" "$configFile") > 0 ]; then
             sed -i -e '/#### change all digital inputs to pull ups/,/#### end change all digital inputs to pull ups/d' "$configFile"
diff --git a/version b/version
index a3db10f..70c703f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v4.5
+v4.6