diff --git a/packages/mediacenter/kodi/config/advancedsettings.xml b/packages/mediacenter/kodi/config/advancedsettings.xml
index ea5d611759..ac55598665 100644
--- a/packages/mediacenter/kodi/config/advancedsettings.xml
+++ b/packages/mediacenter/kodi/config/advancedsettings.xml
@@ -1,19 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
   <remotedelay>1</remotedelay>
-  <cputempcommand>cputemp</cputempcommand>
-  <gputempcommand>gputemp</gputempcommand>
-  <video>
-    <latency>
-      <delay>0</delay>
-      <refresh>
-        <min>23</min>
-        <max>24</max>
-        <delay>175</delay>
-      </refresh>
-    </latency>
-  </video>
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>
diff --git a/projects/Generic/kodi/advancedsettings.xml b/projects/Generic/kodi/advancedsettings.xml
new file mode 100644
index 0000000000..9bffe9c05b
--- /dev/null
+++ b/projects/Generic/kodi/advancedsettings.xml
@@ -0,0 +1,14 @@
+<advancedsettings>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
+  <video>
+    <latency>
+      <delay>0</delay>
+      <refresh>
+        <min>23</min>
+        <max>24</max>
+        <delay>175</delay>
+      </refresh>
+    </latency>
+  </video>
+</advancedsettings>
diff --git a/projects/Odroid_C2/kodi/advancedsettings.xml b/projects/Odroid_C2/kodi/advancedsettings.xml
new file mode 100644
index 0000000000..e37a965f54
--- /dev/null
+++ b/projects/Odroid_C2/kodi/advancedsettings.xml
@@ -0,0 +1,4 @@
+<advancedsettings>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
+</advancedsettings>
diff --git a/projects/RPi/kodi/advancedsettings.xml b/projects/RPi/kodi/advancedsettings.xml
index 00ed0dda87..34d27842b4 100644
--- a/projects/RPi/kodi/advancedsettings.xml
+++ b/projects/RPi/kodi/advancedsettings.xml
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
   <fanartres>720</fanartres>
   <imageres>540</imageres>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
 </advancedsettings>
diff --git a/projects/RPi2/kodi/advancedsettings.xml b/projects/RPi2/kodi/advancedsettings.xml
index 00ed0dda87..34d27842b4 100644
--- a/projects/RPi2/kodi/advancedsettings.xml
+++ b/projects/RPi2/kodi/advancedsettings.xml
@@ -1,12 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
   <fanartres>720</fanartres>
   <imageres>540</imageres>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
 </advancedsettings>
diff --git a/projects/WeTek_Core/kodi/advancedsettings.xml b/projects/WeTek_Core/kodi/advancedsettings.xml
index cd65434ad5..e37a965f54 100644
--- a/projects/WeTek_Core/kodi/advancedsettings.xml
+++ b/projects/WeTek_Core/kodi/advancedsettings.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
 </advancedsettings>
diff --git a/projects/WeTek_Hub/kodi/advancedsettings.xml b/projects/WeTek_Hub/kodi/advancedsettings.xml
index cd65434ad5..e37a965f54 100644
--- a/projects/WeTek_Hub/kodi/advancedsettings.xml
+++ b/projects/WeTek_Hub/kodi/advancedsettings.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
 </advancedsettings>
diff --git a/projects/WeTek_Play/kodi/advancedsettings.xml b/projects/WeTek_Play/kodi/advancedsettings.xml
index cd65434ad5..e37a965f54 100644
--- a/projects/WeTek_Play/kodi/advancedsettings.xml
+++ b/projects/WeTek_Play/kodi/advancedsettings.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
 </advancedsettings>
diff --git a/projects/WeTek_Play_2/kodi/advancedsettings.xml b/projects/WeTek_Play_2/kodi/advancedsettings.xml
index cd65434ad5..e37a965f54 100644
--- a/projects/WeTek_Play_2/kodi/advancedsettings.xml
+++ b/projects/WeTek_Play_2/kodi/advancedsettings.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
 </advancedsettings>
diff --git a/projects/imx6/kodi/advancedsettings.xml b/projects/imx6/kodi/advancedsettings.xml
index 2ef3dccb44..e37a965f54 100644
--- a/projects/imx6/kodi/advancedsettings.xml
+++ b/projects/imx6/kodi/advancedsettings.xml
@@ -1,8 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
-  <showexitbutton>false</showexitbutton>
-  <remotedelay>1</remotedelay>
-  <samba>
-    <clienttimeout>30</clienttimeout>
-  </samba>
+  <cputempcommand>cputemp</cputempcommand>
+  <gputempcommand>gputemp</gputempcommand>
 </advancedsettings>
diff --git a/projects/imx6/kodi/guisettings.xml b/projects/imx6/kodi/guisettings.xml
index 7e4ba03a97..7a123f8f11 100644
--- a/projects/imx6/kodi/guisettings.xml
+++ b/projects/imx6/kodi/guisettings.xml
@@ -8,9 +8,4 @@
   <audiooutput>
     <audiodevice>ALSA:hdmi:CARD=imxhdmisoc,DEV=0</audiodevice>
   </audiooutput>
-<!--
-  <videoscreen>
-    <updateresolutions>false</updateresolutions>
-  </videoscreen>
--->
 </settings>