diff --git a/720p/DialogAudioDSPSettings.xml b/720p/DialogAudioDSPSettings.xml
deleted file mode 100644
index 95fa7c4..0000000
--- a/720p/DialogAudioDSPSettings.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
- 5
-
- 240
- 60
-
- dialogeffect
-
-
- Conditional
-
- background image
- 0
- 0
- 800
- 600
- DialogBack2.png
-
-
- Dialog Header image
- 40
- 16
- 720
- 40
- dialogheader.png
-
-
- header label
- 40
- 20
- 720
- 30
- font13_title
-
- center
- center
- selected
- black
-
-
- Close Window button
- 710
- 15
- 64
- 32
-
- -
- PreviousMenu
- DialogCloseButton-focus.png
- DialogCloseButton.png
- system.getbool(input.enablemouse)
-
-
- control area
- 40
- 65
- 520
- 470
- 5
- 60
- 60
- 60
- 5
- 5
-
-
- 560
- 65
- 25
- 470
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 5
- 5
- 61
- 61
- false
- vertical
-
-
- info label
- 40
- 540
- 720
- 30
- font13_title
-
- left
- center
- selected
- black
-
-
- Audio DSP Image
- 555
- 540
- 85
- 35
- keep
- !IsEmpty(ADSP.MasterOwnIcon)
- $INFO[ADSP.MasterOwnIcon]
-
-
- Audio Codec Image
- 640
- 540
- 85
- 35
- keep
- $INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]
- IsEmpty(ADSP.MasterOverrideIcon) + Player.HasVideo
-
-
- Audio Codec Image
- 640
- 540
- 85
- 35
- keep
- $INFO[MusicPlayer.Codec,flagging/audio/,.png]
- IsEmpty(ADSP.MasterOverrideIcon) + Player.HasAudio
-
-
- Audio Codec Override Image
- 640
- 540
- 85
- 35
- keep
- !IsEmpty(ADSP.MasterOverrideIcon)
- $INFO[ADSP.MasterOverrideIcon]
-
-
- Audio Channels Image
- 730
- 540
- 50
- 35
- keep
- $INFO[VideoPlayer.AudioChannels,flagging/audio/,.png]
-
-
- type label
- 590
- 65
- 720
- 30
- font13_title
-
- left
- center
- grey2
- black
-
-
- type label
- 590
- 100
- 230
- 30
- font13_title
-
- left
- center
- selected
- black
-
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
- center
- yes
-
-
- separator image
- 2
- separator2.png
-
-
- Default Edit
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
-
-
- Default Slider
- 40
- button-nofocus.png
- button-focus2.png
- font13
- grey2
- white
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
-
diff --git a/720p/DialogContentSettings.xml b/720p/DialogContentSettings.xml
deleted file mode 100644
index a252194..0000000
--- a/720p/DialogContentSettings.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
- 20
-
- 240
- 90
-
- dialogeffect
-
-
- Conditional
-
-
-
-
-
-
-
-
-
-
- Content Picker
- 30
- 60
- 740
- 40
- 28
- 21
- font13
-
-
- Information Provider Button
- 30
- 105
- 740
- 40
- 20
- 22
- font13
-
-
- Scraper Settings Button
- 30
- 150
- 740
- 40
-
- 21
- 5
-
-
- Scanning Options Header
- 30
- 205
- 740
- 20
- font12
-
- center
- center
- blue
- black
-
-
- control area
- 30
- 235
- 740
- 220
- 4
- 22
- 28
- 5
- 5
-
-
- Default Button
- 0
- 0
- 40
- font13
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- button-focus2.png
-
-
- 470
-
- OK Button
- 195
- 0
- 200
- 40
- center
- center
- font12_title
-
- 29
- 29
- 5
- 20
-
-
- Cancel Button
- 405
- 0
- 200
- 40
- center
- center
- font12_title
-
- 28
- 28
- 5
- 20
-
-
-
-
-
\ No newline at end of file
diff --git a/720p/DialogMediaFilter.xml b/720p/DialogMediaFilter.xml
deleted file mode 100644
index 3c8fa41..0000000
--- a/720p/DialogMediaFilter.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-
- 5
-
- 240
- 100
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- control area
- 30
- 70
- 720
- 350
- 4
- 6
- 9001
- 9001
- 9001
- 6
-
-
- 755
- 70
- 25
- 350
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 5
- 9001
- false
- vertical
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- invalid
- button-nofocus.png
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
- center
- yes
-
-
- Default Slider
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
- center
-
-
- Default Edit
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
-
-
- 190
- 435
-
- Ok Button
- 0
- 0
- 200
- 40
- center
- center
- button-nofocus.png
- button-focus.png
-
- font12_title
- 5
- 27
- 27
- 5
-
-
- Clear Button
- 210
- 0
- 200
- 40
- center
- center
- button-nofocus.png
- button-focus.png
-
- font12_title
- 5
- 28
- 28
- 5
-
-
-
-
diff --git a/720p/DialogNetworkSetup.xml b/720p/DialogNetworkSetup.xml
deleted file mode 100644
index ad05ae7..0000000
--- a/720p/DialogNetworkSetup.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
- 10
-
- 240
- 135
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- Protocol SpinControl
- 30
- 70
- 40
- 740
- button-focus2.png
- button-nofocus.png
- white
- grey3
- 12
- center
- yes
- font13
-
- 18
- 11
- 10
- 10
-
-
- Server Address Button
- 30
- 115
- 565
- 40
- 12
- center
- button-focus2.png
- font13
-
- 10
- 12
- 12
- 16
-
-
- Server Browse Button
- 600
- 115
- 170
- 40
- 12
- font12_title
-
- center
- center
- 10
- 11
- 11
- 16
-
-
- Remote path Button
- 30
- 160
- 740
- 40
- 12
- center
- button-focus2.png
- font13
-
- 11
- 16
- 16
- 13
-
-
- Port Button
- 30
- 205
- 740
- 40
- 12
- center
- button-focus2.png
- font13
-
- 16
- 13
- 13
- 14
-
-
- Username Button
- 30
- 250
- 740
- 40
- 12
- center
- button-focus2.png
- font13
-
- 13
- 14
- 14
- 15
-
-
- Password Button
- 30
- 295
- 740
- 40
- 12
- center
- button-focus2.png
- font13
-
- 14
- 15
- 15
- 18
-
-
- Ok Button
- 195
- 375
- 200
- 40
- center
- center
- font12_title
-
- 15
- 19
- 19
- 10
-
-
- Cancel Button
- 405
- 375
- 200
- 40
- center
- center
- font12_title
-
- 15
- 18
- 18
- 10
-
-
-
diff --git a/720p/DialogPVRTimerSettings.xml b/720p/DialogPVRTimerSettings.xml
deleted file mode 100644
index 774749f..0000000
--- a/720p/DialogPVRTimerSettings.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
- 29
-
- 275
- 30
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- control area
- 30
- 70
- 670
- 510
- 5
- 9001
- 9001
- 9001
- 9001
-
-
- 160
- 590
-
- OK Button
- 0
- 0
- 200
- 40
- center
- center
- font12_title
-
- 29
- 29
- 5
- 5
-
-
- Cancel Button
- 210
- 0
- 200
- 40
- center
- center
- font12_title
-
- 28
- 28
- 5
- 5
-
-
-
- Default Button
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
-
-
- Default RadioButton
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
-
-
- Default spincontrolex
- 40
- grey2
- white
- button-focus2.png
- button-nofocus.png
- font13
- center
- yes
-
-
- Default Slider
- 40
- button-focus2.png
- button-nofocus.png
- font13
- grey2
- white
-
-
- Default Seperator
- 2
- separator2.png
-
-
- Default Edit
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
-
diff --git a/720p/DialogPeripheralSettings.xml b/720p/DialogPeripheralSettings.xml
deleted file mode 100644
index 5b4a49f..0000000
--- a/720p/DialogPeripheralSettings.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
- 5
-
- 290
- 75
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- Conditional
- control area
- 30
- 70
- 630
- 410
- 5
- 60
- 28
- 60
- 28
- 28
-
-
- 658
- 70
- 25
- 410
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 5
- 5
- 60
- 60
- false
- vertical
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
- center
- yes
-
-
- Default Slider
- 40
- button-nofocus.png
- button-focus2.png
- font13
- grey2
- white
-
-
- separator image
- 2
- separator2.png
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
- 40
- 505
-
- Cancel Button
- 0
- 0
- 200
- 40
- center
- center
- font12_title
-
- 50
- 28
- 5
- 5
-
-
- OK Button
- 0
- 210
- 200
- 40
- center
- center
- font12_title
-
- 29
- 50
- 5
- 5
-
-
- Defaults Button
- 0
- 420
- 200
- 40
- center
- center
- font12_title
-
- 28
- 29
- 5
- 5
-
-
-
-
diff --git a/720p/DialogSettings.xml b/720p/DialogSettings.xml
new file mode 100644
index 0000000..d5a1ca0
--- /dev/null
+++ b/720p/DialogSettings.xml
@@ -0,0 +1,158 @@
+
+
+ 5
+
+ 240
+ 142
+
+ dialogeffect
+
+
+ Conditional
+ Conditional
+ Conditional
+
+
+
+
+
+
+
+
+
+ Conditional
+ control area
+ 35
+ 70
+ 730
+ 308
+ 4
+ 60
+ 9001
+ 9001
+ 60
+ 60
+
+
+ 758
+ 70
+ 25
+ 308
+ ScrollBarV.png
+ ScrollBarV_bar.png
+ ScrollBarV_bar_focus.png
+ ScrollBarNib.png
+ ScrollBarNib.png
+ 5
+ 5
+ 60
+ 60
+ false
+ vertical
+
+
+ Default Button
+ 40
+ font13
+ button-focus2.png
+
+
+ Default RadioButton
+ 40
+ font13
+ button-focus2.png
+
+
+ Default SpinControlex
+ 40
+ font13
+ grey2
+ white
+ button-nofocus.png
+ button-focus2.png
+ center
+ yes
+
+
+ separator image
+ 2
+ separator2.png
+
+
+ Default Edit
+ 40
+ font13
+ grey2
+ white
+ button-nofocus.png
+ button-focus2.png
+
+
+ Default Slider
+ 40
+ button-nofocus.png
+ button-focus2.png
+ font13
+ grey2
+ white
+
+
+ Default Heading
+ 34
+ font12
+ center
+ center
+ blue
+ black
+
+
+ 170
+ 393
+ 460
+ center
+ 20
+ horizontal
+
+ OK Button
+ 0
+ 200
+ 40
+ center
+ center
+ font12_title
+ 30
+ 29
+ 5
+ 5
+
+
+ Cancel Button
+ 0
+ 200
+ 40
+ center
+ center
+ font12_title
+
+ 28
+ 30
+ 5
+ 5
+
+
+ Settings Button
+ 0
+ 200
+ 40
+ center
+ center
+ font12_title
+ 29
+ 28
+ 5
+ 5
+
+
+
+
+
diff --git a/720p/LockSettings.xml b/720p/LockSettings.xml
deleted file mode 100644
index 25a579f..0000000
--- a/720p/LockSettings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
- 5
-
- 290
- 75
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- control area
- 30
- 70
- 640
- 410
- 5
- 28
- 29
- 28
- 28
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
- center
- yes
-
-
- separator image
- 2
- separator2.png
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
- Ok Button
- 145
- 505
- 200
- 40
- center
- center
- font12_title
-
- 29
- 29
- 5
- 5
-
-
- Cancel Button
- 355
- 505
- 200
- 40
- center
- center
- font12_title
-
- 28
- 28
- 5
- 5
-
-
-
diff --git a/720p/ProfileSettings.xml b/720p/ProfileSettings.xml
deleted file mode 100644
index 9006ef7..0000000
--- a/720p/ProfileSettings.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-
-
- 290
- 75
-
- dialogeffect
-
-
-
-
-
-
-
-
-
-
-
- profile image
- 30
- 70
- 150
- 150
- left
- stretch
- unknown-user.png
- ThumbBorder.png
- 8
-
-
- profile name label
- 200
- 70
- 460
- left
- font13_title
- blue
-
-
-
- profile name Value
- 200
- 95
- 460
- left
- font16
- white
-
-
- profile directory label
- 200
- 155
- 460
- left
- font13_title
- blue
-
-
-
- profile directory Value
- 200
- 180
- 460
- left
- font13
- white
-
-
- control area
- 30
- 230
- 640
- 265
- 5
- 60
- 28
- 60
- 28
- 28
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
- button-nofocus.png
- center
- yes
-
-
- separator image
- 2
- separator2.png
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
- Ok Button
- 145
- 505
- 200
- 40
- center
- center
- font12_title
-
- 29
- 29
- 5
- 5
-
-
- Cancel Button
- 355
- 505
- 200
- 40
- center
- center
- font12_title
-
- 28
- 28
- 5
- 5
-
-
-
diff --git a/720p/VideoOSDSettings.xml b/720p/VideoOSDSettings.xml
deleted file mode 100644
index 10113b6..0000000
--- a/720p/VideoOSDSettings.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
- 5
-
- 240
- 60
-
- dialogeffect
-
-
- Conditional
-
- background image
- 0
- 0
- 800
- 600
- DialogBack2.png
-
-
- Dialog Header image
- 40
- 16
- 720
- 40
- dialogheader.png
-
-
- header label
- 40
- 20
- 720
- 30
- font13_title
- center
- center
- selected
- black
-
-
- Close Window button
- 710
- 15
- 64
- 32
-
- -
- PreviousMenu
- DialogCloseButton-focus.png
- DialogCloseButton.png
- 2
- 2
- 2
- 2
- system.getbool(input.enablemouse)
-
-
- control area
- 40
- 65
- 720
- 505
- 5
- 60
- 60
- 60
- 5
- 5
-
-
- 760
- 65
- 25
- 490
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 5
- 5
- 61
- 61
- false
- vertical
-
-
-
- Default Slider
- 40
- button-nofocus.png
- button-focus2.png
- font13
- grey2
- white
-
-
- Default Button
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default RadioButton
- 0
- 0
- 40
- font13
- grey2
- white
- button-focus2.png
-
-
- Default SpinControlex
- 0
- 0
- 40
- font13
- grey2
- white
- button-nofocus.png
- button-focus2.png
- center
- yes
-
-
- separator image
- 2
- separator2.png
-
-
- Default Label
- 0
- 0
- 30
-
- center
- bottom
- font13_title
- grey
- black
-
-
-
diff --git a/addon.xml b/addon.xml
index f87e7c3..4095cb7 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
diff --git a/changelog.txt b/changelog.txt
index eb6eaa2..150273e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+[B]3.0.2[/B]
+
+- Merged setting dialogs into DialogSettings
+
[B]3.0.1[/B]
- Updated language files from Transifex