Prep for merge with master

47 files changed, 448 insertions, 448 deletions

diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm
index 71bc2de3..6e6758ff 100644
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@@ -13507,6 +13507,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 00000000

 01010101

 01010100

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/bold.png b/resources/osd/bold.png
index ef65f23b..48f13fc3 100644
--- a/resources/osd/bold.png
+++ b/resources/osd/bold.png
diff --git a/resources/osd/bold/211.png b/resources/osd/bold/211.png
deleted file mode 100644
index e6b1ff2e..00000000
--- a/resources/osd/bold/211.png
+++ /dev/null
diff --git a/resources/osd/bold/212.png b/resources/osd/bold/212.png
index b2314837..e6b1ff2e 100644
--- a/resources/osd/bold/212.png
+++ b/resources/osd/bold/212.png
diff --git a/resources/osd/bold/213.png b/resources/osd/bold/213.png
new file mode 100644
index 00000000..b2314837
--- /dev/null
+++ b/resources/osd/bold/213.png
diff --git a/resources/osd/bold/213-214.png b/resources/osd/bold/214-215.png
index 15724e18..15724e18 100644
--- a/resources/osd/bold/213-214.png
+++ b/resources/osd/bold/214-215.png
diff --git a/resources/osd/bold/215-216.png b/resources/osd/bold/216-217.png
index 9b9ef0e0..9b9ef0e0 100644
--- a/resources/osd/bold/215-216.png
+++ b/resources/osd/bold/216-217.png
diff --git a/resources/osd/clarity.mcm b/resources/osd/clarity.mcm
index 41785e1a..d18efa91 100644
--- a/resources/osd/clarity.mcm
+++ b/resources/osd/clarity.mcm
@@ -13507,6 +13507,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 00000000

 01010101

 01010100

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/clarity.png b/resources/osd/clarity.png
index 94d8f9bb..373358ae 100644
--- a/resources/osd/clarity.png
+++ b/resources/osd/clarity.png
diff --git a/resources/osd/clarity/211.png b/resources/osd/clarity/211.png
deleted file mode 100644
index eec356d4..00000000
--- a/resources/osd/clarity/211.png
+++ /dev/null
diff --git a/resources/osd/clarity/212.png b/resources/osd/clarity/212.png
index e5db0853..eec356d4 100644
--- a/resources/osd/clarity/212.png
+++ b/resources/osd/clarity/212.png
diff --git a/resources/osd/clarity/213.png b/resources/osd/clarity/213.png
new file mode 100644
index 00000000..e5db0853
--- /dev/null
+++ b/resources/osd/clarity/213.png
diff --git a/resources/osd/clarity/213-214.png b/resources/osd/clarity/214-215.png
index eea4b08d..eea4b08d 100644
--- a/resources/osd/clarity/213-214.png
+++ b/resources/osd/clarity/214-215.png
diff --git a/resources/osd/clarity/215-216.png b/resources/osd/clarity/216-217.png
index 674b760c..674b760c 100644
--- a/resources/osd/clarity/215-216.png
+++ b/resources/osd/clarity/216-217.png
diff --git a/resources/osd/clarity_medium.mcm b/resources/osd/clarity_medium.mcm
index 3c061ac4..94cdde0e 100644
--- a/resources/osd/clarity_medium.mcm
+++ b/resources/osd/clarity_medium.mcm
@@ -13513,6 +13513,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 00000000

 01010101

 01010100

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/clarity_medium.png b/resources/osd/clarity_medium.png
index c305adca..ba096c7c 100644
--- a/resources/osd/clarity_medium.png
+++ b/resources/osd/clarity_medium.png
diff --git a/resources/osd/clarity_medium/211.png b/resources/osd/clarity_medium/211.png
deleted file mode 100644
index f46e7be3..00000000
--- a/resources/osd/clarity_medium/211.png
+++ /dev/null
diff --git a/resources/osd/clarity_medium/212.png b/resources/osd/clarity_medium/212.png
index ff6d78e7..f46e7be3 100644
--- a/resources/osd/clarity_medium/212.png
+++ b/resources/osd/clarity_medium/212.png
diff --git a/resources/osd/clarity_medium/213.png b/resources/osd/clarity_medium/213.png
new file mode 100644
index 00000000..ff6d78e7
--- /dev/null
+++ b/resources/osd/clarity_medium/213.png
diff --git a/resources/osd/clarity_medium/213-214.png b/resources/osd/clarity_medium/214-215.png
index 2da127a4..2da127a4 100644
--- a/resources/osd/clarity_medium/213-214.png
+++ b/resources/osd/clarity_medium/214-215.png
diff --git a/resources/osd/clarity_medium/215-216.png b/resources/osd/clarity_medium/216-217.png
index ba6aef3e..ba6aef3e 100644
--- a/resources/osd/clarity_medium/215-216.png
+++ b/resources/osd/clarity_medium/216-217.png
diff --git a/resources/osd/impact.mcm b/resources/osd/impact.mcm
index a975b008..9b8c49c5 100644
--- a/resources/osd/impact.mcm
+++ b/resources/osd/impact.mcm
@@ -13510,6 +13510,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 01000000

 01010101

 01010101

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/impact.png b/resources/osd/impact.png
index 795c1182..131ad2bd 100644
--- a/resources/osd/impact.png
+++ b/resources/osd/impact.png
diff --git a/resources/osd/impact/211.png b/resources/osd/impact/211.png
deleted file mode 100644
index 1b5245f1..00000000
--- a/resources/osd/impact/211.png
+++ /dev/null
diff --git a/resources/osd/impact/212.png b/resources/osd/impact/212.png
index 6b291249..1b5245f1 100644
--- a/resources/osd/impact/212.png
+++ b/resources/osd/impact/212.png
diff --git a/resources/osd/impact/213.png b/resources/osd/impact/213.png
new file mode 100644
index 00000000..6b291249
--- /dev/null
+++ b/resources/osd/impact/213.png
diff --git a/resources/osd/impact/213-214.png b/resources/osd/impact/214-215.png
index 0695dd34..0695dd34 100644
--- a/resources/osd/impact/213-214.png
+++ b/resources/osd/impact/214-215.png
diff --git a/resources/osd/impact/215-216.png b/resources/osd/impact/216-217.png
index aee0b0f0..aee0b0f0 100644
--- a/resources/osd/impact/215-216.png
+++ b/resources/osd/impact/216-217.png
diff --git a/resources/osd/impact_mini.mcm b/resources/osd/impact_mini.mcm
index 1ddf4c1d..afc7f3cb 100644
--- a/resources/osd/impact_mini.mcm
+++ b/resources/osd/impact_mini.mcm
@@ -13510,6 +13510,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 01000000

 01010101

 01010101

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/impact_mini.png b/resources/osd/impact_mini.png
index 6bd13ed4..d87fd6e2 100644
--- a/resources/osd/impact_mini.png
+++ b/resources/osd/impact_mini.png
diff --git a/resources/osd/impact_mini/211.png b/resources/osd/impact_mini/211.png
deleted file mode 100644
index 9368aa35..00000000
--- a/resources/osd/impact_mini/211.png
+++ /dev/null
diff --git a/resources/osd/impact_mini/212.png b/resources/osd/impact_mini/212.png
index 7d9d40e0..9368aa35 100644
--- a/resources/osd/impact_mini/212.png
+++ b/resources/osd/impact_mini/212.png
diff --git a/resources/osd/impact_mini/213.png b/resources/osd/impact_mini/213.png
new file mode 100644
index 00000000..7d9d40e0
--- /dev/null
+++ b/resources/osd/impact_mini/213.png
diff --git a/resources/osd/impact_mini/213-214.png b/resources/osd/impact_mini/214-215.png
index 830ae4bb..830ae4bb 100644
--- a/resources/osd/impact_mini/213-214.png
+++ b/resources/osd/impact_mini/214-215.png
diff --git a/resources/osd/impact_mini/215-216.png b/resources/osd/impact_mini/216-217.png
index 46c679a4..46c679a4 100644
--- a/resources/osd/impact_mini/215-216.png
+++ b/resources/osd/impact_mini/216-217.png
diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm
index 92104f98..4fe33386 100644
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@@ -13510,6 +13510,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 00000000

 01010101

 01010100

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/large.png b/resources/osd/large.png
index e255c435..a6d1d7f0 100644
--- a/resources/osd/large.png
+++ b/resources/osd/large.png
diff --git a/resources/osd/large/212.png b/resources/osd/large/212.png
index 49f10750..8ee6a730 100644
--- a/resources/osd/large/212.png
+++ b/resources/osd/large/212.png
diff --git a/resources/osd/large/211.png b/resources/osd/large/213.png
index 8ee6a730..49f10750 100644
--- a/resources/osd/large/211.png
+++ b/resources/osd/large/213.png
diff --git a/resources/osd/large/213-214.png b/resources/osd/large/214-215.png
index 36f782fa..36f782fa 100644
--- a/resources/osd/large/213-214.png
+++ b/resources/osd/large/214-215.png
diff --git a/resources/osd/large/215-216.png b/resources/osd/large/216-217.png
index 94670ca5..94670ca5 100644
--- a/resources/osd/large/215-216.png
+++ b/resources/osd/large/216-217.png
diff --git a/resources/osd/vision.mcm b/resources/osd/vision.mcm
index 1db33d99..d53cc13e 100644
--- a/resources/osd/vision.mcm
+++ b/resources/osd/vision.mcm
@@ -13510,6 +13510,70 @@ MAX7456
 01010101

 01010101

 01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

+01010101

 00000000

 01010101

 01010100

@@ -13896,70 +13960,6 @@ MAX7456
 01010101

 01010101

 01010101

-00010101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-10000101

-01010101

-01010101

-00000000

-01010101

-01010101

-10101010

-00010101

-01010101

-00000000

-01010101

-01010101

-10001000

-01010101

-01010101

-00100010

-00010101

-01010101

-00100010

-00010101

-01010101

-00000010

-00010101

-01010101

-00010010

-00010101

-01010101

-01010100

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

-01010101

 01010101

 01010101

 01010101

diff --git a/resources/osd/vision.png b/resources/osd/vision.png
index 917f19d5..fe2ba791 100644
--- a/resources/osd/vision.png
+++ b/resources/osd/vision.png
diff --git a/resources/osd/vision/212.png b/resources/osd/vision/212.png
index 99a5a74e..3edf2f4e 100644
--- a/resources/osd/vision/212.png
+++ b/resources/osd/vision/212.png
diff --git a/resources/osd/vision/211.png b/resources/osd/vision/213.png
index 3edf2f4e..99a5a74e 100644
--- a/resources/osd/vision/211.png
+++ b/resources/osd/vision/213.png
diff --git a/resources/osd/vision/213-214.png b/resources/osd/vision/214-215.png
index 2f1f9fd0..2f1f9fd0 100644
--- a/resources/osd/vision/213-214.png
+++ b/resources/osd/vision/214-215.png
diff --git a/resources/osd/vision/215-216.png b/resources/osd/vision/216-217.png
index 96a5ec92..96a5ec92 100644
--- a/resources/osd/vision/215-216.png
+++ b/resources/osd/vision/216-217.png