diff --git a/_Converted_/Pronto/M/Marantz/52CC.ir b/_Converted_/Pronto/M/Marantz/52CC.ir
index effa9a23..f166a22c 100644
--- a/_Converted_/Pronto/M/Marantz/52CC.ir
+++ b/_Converted_/Pronto/M/Marantz/52CC.ir
@@ -121,62 +121,72 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 1791 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 1791 91146
 #
-name: DISC_1_E
+# DISC_1_E [20 1 0] {110-10100--000001-000000}
+name: DISC_1_E (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_1_O
+# DISC_1_O [20 1 0] {110-10100--000001-000000}
+name: DISC_1_O (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2_E
+# DISC_2_E [20 2 0] {110-10100--000010-000000}
+name: DISC_2_E (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2_O
+# DISC_2_O [20 2 0] {110-10100--000010-000000}
+name: DISC_2_O (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3_E
+# DISC_3_E [20 3 0] {110-10100--000011-000000}
+name: DISC_3_E (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3_O
+# DISC_3_O [20 3 0] {110-10100--000011-000000}
+name: DISC_3_O (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4_E
+# DISC_4_E [20 4 0] {110-10100--000100-000000}
+name: DISC_4_E (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4_O
+# DISC_4_O [20 4 0] {110-10100--000100-000000}
+name: DISC_4_O (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5_E
+# DISC_5_E [20 5 0] {110-10100--000101-000000}
+name: DISC_5_E (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5_O
+# DISC_5_O [20 5 0] {110-10100--000101-000000}
+name: DISC_5_O (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
diff --git a/_Converted_/Pronto/M/Marantz/52CC_1.ir b/_Converted_/Pronto/M/Marantz/52CC_1.ir
index c21a4231..d7fc292c 100644
--- a/_Converted_/Pronto/M/Marantz/52CC_1.ir
+++ b/_Converted_/Pronto/M/Marantz/52CC_1.ir
@@ -61,32 +61,37 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 1791 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 1791 91146
 #
-name: DISC_1
+# DISC_1 [20 1 0] {110-10100--000001-000000}
+name: DISC_1 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2
+# DISC_2 [20 2 0] {110-10100--000010-000000}
+name: DISC_2 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3
+# DISC_3 [20 3 0] {110-10100--000011-000000}
+name: DISC_3 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4
+# DISC_4 [20 4 0] {110-10100--000100-000000}
+name: DISC_4 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5
+# DISC_5 [20 5 0] {110-10100--000101-000000}
+name: DISC_5 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
diff --git a/_Converted_/Pronto/M/Marantz/80SC_TUNER_CONTROLS.ir b/_Converted_/Pronto/M/Marantz/80SC_TUNER_CONTROLS.ir
index d30cb21c..0aea2144 100644
--- a/_Converted_/Pronto/M/Marantz/80SC_TUNER_CONTROLS.ir
+++ b/_Converted_/Pronto/M/Marantz/80SC_TUNER_CONTROLS.ir
@@ -1,134 +1,156 @@
 Filetype: IR signals file
 Version: 1
 #
+# STBY [raw] {11010001-001100}
 name: STBY
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1819 1791 896 896 896 896 1791 1791 896 896 1791 896 896 1791 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0C 00 00 00
 #
+# VOL- [raw] {11010001-010001}
 name: VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1735 1791 1791 840 840 840 840 1791 1791 1791 1791 840 840 840 840 1791 840 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 11 00 00 00
 #
+# VOL+ [raw] {11010001-010000}
 name: VOL+
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1735 1791 1791 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 10 00 00 00
 #
+# 1 [raw] {11010001-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1735 1819 1791 868 868 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010001-000010}
 name: 2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 896 896 1791 1791 896 896 896 896 896 896 1791 1791 90334
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010001-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1735 1791 1791 868 868 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010001-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1763 1819 1763 896 896 896 896 1763 1763 896 896 896 896 1763 1763 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010001-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 868 868 1791 1791 868 868 868 868 1791 1791 1791 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010001-000110}
 name: 6
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1763 1819 1763 896 896 896 896 1763 1763 896 896 896 896 1763 896 896 1763 90334
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010001-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1735 1819 1791 868 868 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010001-001000}
 name: 8
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1819 1791 896 896 896 896 1791 1791 896 896 1791 1791 896 896 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010001-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1819 1791 840 840 840 840 1791 1791 840 840 1791 1791 840 840 1791 840 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010001-000000}
 name: 0
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1735 1819 1791 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 00 00 00 00
 #
+# UP [raw] {11010001-100000}
 name: UP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1763 1819 1763 896 896 896 896 1763 896 896 1763 896 896 896 896 896 896 896 896 90362
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# DOWN [raw] {11010001-100001}
 name: DOWN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1763 1819 1763 868 868 868 868 1763 868 868 1763 868 868 868 868 868 868 1763 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1819 1791 1791 1791 868 868 1791 868 868 868 868 868 868 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TUNE [raw] {11010001-111111}
 name: TUNE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1735 1819 1791 868 868 868 868 1791 868 868 868 868 868 868 868 868 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# AUX1 [raw] {11000000-111111}
 name: AUX1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1735 868 868 868 868 868 868 868 868 868 868 1875 868 868 868 868 868 868 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# PHONO [raw] {11010101-111111}
 name: PHONO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 923 1791 1791 1791 1791 1791 1791 923 923 923 923 923 923 923 923 923 923 923 923 784 89551
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
+# TAPE_1 [raw] {11010010-111111}
 name: TAPE_1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 1791 868 868 868 868 868 868 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# DAT/TAPE_2 [raw] {11010111-111111}
 name: DAT/TAPE_2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 923 1735 1819 1791 1791 923 923 923 923 923 923 923 923 923 923 923 923 923 923 923 923 784 89551
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
+# AUX2 [raw] {11000101-111111}
 name: AUX2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 868 868 868 868 1791 1791 1791 868 868 868 868 868 868 868 868 868 868 868 868 868 89551
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/AUDIO_CASSETTE_DECK.ir b/_Converted_/Pronto/M/Marantz/AUDIO_CASSETTE_DECK.ir
index cdadfdf3..f0dd3d1f 100644
--- a/_Converted_/Pronto/M/Marantz/AUDIO_CASSETTE_DECK.ir
+++ b/_Converted_/Pronto/M/Marantz/AUDIO_CASSETTE_DECK.ir
@@ -1,176 +1,205 @@
 Filetype: IR signals file
 Version: 1
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11010010-110110}
 name: STOP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11010010-110000}
 name: PAUSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# RECORD [raw] {11010010-110111}
 name: RECORD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 840 840 840 840 840 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# F_STEP [raw] {11010010-100000}
 name: F_STEP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# R_STEP [raw] {11010010-100001}
 name: R_STEP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 1791 1791 868 868 868 868 868 868 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# PAUSE [raw] {11010010-101111}
 name: PAUSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# DECK_A [raw] {11010010-101100}
 name: DECK_A
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11010010-101110}
 name: DECK_B
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# 1 [raw] {11010010-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 868 868 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010010-000010}
 name: 2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010010-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 868 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010010-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 1791 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010010-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 1791 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010010-000110}
 name: 6
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 896 896 1791 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010010-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 868 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010010-001000}
 name: 8
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 1791 1791 896 896 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010010-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 1791 868 868 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010010-000000}
 name: 0
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# CONT [raw] {11010010-100100}
 name: CONT
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 24 00 00 00
 #
+# R-MODE [raw] {11010010-011101}
 name: R-MODE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 1791 868 868 868 868 1791 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 1D 00 00 00
 #
+# UP [raw] {11010010-010000}
 name: UP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90334
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# COUNTER [raw] {11010010-001111}
 name: COUNTER
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 868 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0F 00 00 00
 #
+# REC-STOP [raw] {11010010-101010}
 name: REC-STOP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 1819 1819 1819 90306
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# AMS [raw] {11010010-101011}
 name: AMS
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 1819 840 840 840 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2B 00 00 00
 #
+# MEMO [raw] {11010010-101001}
 name: MEMO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 840 840 1819 840 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# DOWN [raw] {11010010-010001}
 name: DOWN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 89523
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/AV-500_RECIEVER_(ODD).ir b/_Converted_/Pronto/M/Marantz/AV-500_RECIEVER_(ODD).ir
index 2bbd88a3..44e6c5b2 100644
--- a/_Converted_/Pronto/M/Marantz/AV-500_RECIEVER_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/AV-500_RECIEVER_(ODD).ir
@@ -7,53 +7,61 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 4411 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 77043
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89888
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11010010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11110111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89888
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# DBS [raw] {11101000-111111}
 name: DBS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 08 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
 name: SURR
 type: raw
@@ -121,11 +129,12 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 4411 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 77043
 #
+# OSD [raw] {11010000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
 name: PIP
 type: raw
@@ -151,23 +160,26 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4411 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 77043
 #
+# BAL_L [raw] {11010000-011011}
 name: BAL_L
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 1B 00 00 00
 #
+# BAL_R [raw] {11110000-011010}
 name: BAL_R
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 1776 90720
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 1A 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89832
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
 name: VOL_RST
 type: raw
@@ -199,68 +211,79 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 76932
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90748
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89832
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# PWR-LD [raw] {11001100-001100}
 name: PWR-LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90748
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0C 00 00 00
 #
+# LD_EJECT [raw] {11001100-101101}
 name: LD_EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2D 00 00 00
 #
+# LD_STOP [raw] {11001100-110110}
 name: LD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 36 00 00 00
 #
+# LD_PAUSE [raw] {11001100-110000}
 name: LD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 30 00 00 00
 #
+# LD_PLAY [raw] {11001100-110101}
 name: LD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 35 00 00 00
 #
+# LD_R_SRCH [raw] {11001100-101100}
 name: LD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2C 00 00 00
 #
+# LD_F_SRCH [raw] {11001100-101110}
 name: LD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2E 00 00 00
 #
+# LD_R_CHAP [raw] {11001100-100100}
 name: LD_R_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 24 00 00 00
 #
+# LD_F_CHAP [raw] {11001100-011110}
 name: LD_F_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1E 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/AV-9000.ir b/_Converted_/Pronto/M/Marantz/AV-9000.ir
index d95b9602..0b0823a3 100644
--- a/_Converted_/Pronto/M/Marantz/AV-9000.ir
+++ b/_Converted_/Pronto/M/Marantz/AV-9000.ir
@@ -1,374 +1,436 @@
 Filetype: IR signals file
 Version: 1
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
-name: 3-D
+# 3-D [16 37 48] {110-10000--100101-110000}
+name: 3-D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 1778 889 889 889 889 889 889 76440
 #
-name: R-EQ
+# R-EQ [16 37 44] {110-10000--100101-101100}
+name: R-EQ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 889 889 76440
 #
+# PHONO [raw] {11010101-111111}
 name: PHONO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
-name: AUTO
+# AUTO [16 37 45] {110-10000--100101-101101}
+name: AUTO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 889 75551
 #
-name: DOLBY
+# DOLBY [16 37 0] {110-10000--100101-000000}
+name: DOLBY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: THX
+# THX [16 37 36] {110-10000--100101-100100}
+name: THX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 889 889 76440
 #
-name: DTS
+# DTS [16 37 46] {110-10000--100101-101110}
+name: DTS (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 889 889 1778 76440
 #
-name: HALL
+# HALL [16 37 1] {110-10000--100101-000001}
+name: HALL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: MATRIX
+# MATRIX [16 37 9] {110-10000--100101-001001}
+name: MATRIX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 889 889 1778 889 75551
 #
-name: MOVIE
+# MOVIE [16 37 29] {110-10000--100101-011101}
+name: MOVIE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 1778 1778 889 75551
 #
-name: 2_CH
+# 2_CH [16 37 30] {110-10000--100101-011110}
+name: 2_CH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
-name: A/D
+# A/D [16 1 1] {110-10000--000001-000001}
+name: A/D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# DIRECT [raw] {11110000-100010}
 name: DIRECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 22 00 00 00
 #
-name: ATT
+# ATT [16 37 43] {110-10000--100101-101011}
+name: ATT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 889 889 889 75551
 #
+# OSD [raw] {11110000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
-name: MONO
+# MONO [16 37 37] {110-10000--100101-100101}
+name: MONO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 1778 889 75551
 #
-name: NITE
+# NITE [16 37 42] {110-10000--100101-101010}
+name: NITE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 1778 76440
 #
-name: MULTI
+# MULTI [16 29 0] {110-10000--011101-000000}
+name: MULTI (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# TREB+ [raw] {11110000-011000}
 name: TREB+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 18 00 00 00
 #
+# TREB- [raw] {11010000-011001}
 name: TREB-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 19 00 00 00
 #
+# BASS+ [raw] {11110000-010110}
 name: BASS+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 16 00 00 00
 #
+# BASS- [raw] {11010000-010111}
 name: BASS-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 17 00 00 00
 #
-name: CH+
+# CH+ [16 37 33] {110-10000--100101-100001}
+name: CH+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 889 889 1778 889 75551
 #
-name: LEVEL+
+# LEVEL+ [16 37 34] {110-10000--100101-100010}
+name: LEVEL+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: LEVEL-
+# LEVEL- [16 37 35] {110-10000--100101-100011}
+name: LEVEL- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
-name: VOL+
+# VOL+ [16 37 39] {110-10000--100101-100111}
+name: VOL+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 889 889 889 889 889 75551
 #
-name: VOL-
+# VOL- [16 37 40] {110-10000--100101-101000}
+name: VOL- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 889 889 889 889 76440
 #
-name: 6_CH
+# 6_CH [16 1 3] {110-10000--000001-000011}
+name: 6_CH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
-name: DISPLAY
+# DISPLAY [16 15 0] {110-10000--001111-000000}
+name: DISPLAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# MODE [raw] {11110000-100101}
 name: MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
+# FM [raw] {11010001-101101}
 name: FM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2D 00 00 00
 #
+# AM [raw] {11110001-101110}
 name: AM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2E 00 00 00
 #
+# BAND [raw] {11010001-111111}
 name: BAND
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# TUNER_MODE [raw] {11110001-100101}
 name: TUNER_MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 25 00 00 00
 #
+# SCAN [raw] {11010001-101011}
 name: SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2B 00 00 00
 #
+# DSS/VCR-2 [raw] {11100110-111111}
 name: DSS/VCR-2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
+# TV [raw] {11000000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
-name: DVD
+# DVD [16 0 10] {110-10000--000000-001010}
+name: DVD (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
+# VCR-1 [raw] {11100101-111111}
 name: VCR-1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# TUNER [raw] {11010001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11010010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# CD-R/MD [raw] {11011010-111111}
 name: CD-R/MD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 1A 00 00 00
+command: 3F 00 00 00
 #
+# MASTER-VOLUME+ [raw] {11110000-010000}
 name: MASTER-VOLUME+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# MASTER-VOLUME- [raw] {11010000-010001}
 name: MASTER-VOLUME-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# MASTER-CHANNEL+ [raw] {11100000-100000}
 name: MASTER-CHANNEL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# MASTER-CHANNEL- [raw] {11000000-100001}
 name: MASTER-CHANNEL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# REW [raw] {11010000-101100}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2C 00 00 00
 #
+# FFWD [raw] {11110000-101011}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2B 00 00 00
 #
+# M [raw] {11010001-101001}
 name: M
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 29 00 00 00
 #
+# C [raw] {11110001-111010}
 name: C
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3A 00 00 00
 #
+# UP [raw] {10010000-010000}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 50 00 00 00
 #
+# LEFT [raw] {10110000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# OK [raw] {10010000-010010}
 name: OK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# RIGHT [raw] {10110000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# DOWN [raw] {10010000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/AV550.ir b/_Converted_/Pronto/M/Marantz/AV550.ir
index 128514bb..ecf6e41a 100644
--- a/_Converted_/Pronto/M/Marantz/AV550.ir
+++ b/_Converted_/Pronto/M/Marantz/AV550.ir
@@ -193,11 +193,12 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 892 865 1783 865 865 1783 865 865 1783 865 865 1783 865 865 865 865 865 865 865 865 865 865 865 88192
 #
-name: DVD
+# DVD [16 0 10] {110-10000--000000-001010}
+name: DVD (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
 name: TV
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/CC-4000.ir b/_Converted_/Pronto/M/Marantz/CC-4000.ir
index 4f077d05..c4a481cc 100644
--- a/_Converted_/Pronto/M/Marantz/CC-4000.ir
+++ b/_Converted_/Pronto/M/Marantz/CC-4000.ir
@@ -1,188 +1,219 @@
 Filetype: IR signals file
 Version: 1
 #
+# OPEN/CLOSE [raw] {11110100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# PROGRAM [raw] {11110100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# RECALL [raw] {11010100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# CANCEL [raw] {11110100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# DISPLAY [raw] {11010100-001011}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# FADER [raw] {10110100-111000}
 name: FADER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 78 00 00 00
 #
+# EDIT [raw] {10010100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# R_SRCH [raw] {11010100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# F_SRCH [raw] {11110100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# R_TRK [raw] {11110100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# F_TRK [raw] {11010100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# AMS [raw] {11110100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# DISC+ [raw] {11010100-011110}
 name: DISC+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# DISC- [raw] {11110100-011111}
 name: DISC-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1F 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC-870_CD_(EVEN).ir b/_Converted_/Pronto/M/Marantz/CC-870_CD_(EVEN).ir
index e06599a8..2ea475c0 100644
--- a/_Converted_/Pronto/M/Marantz/CC-870_CD_(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/CC-870_CD_(EVEN).ir
@@ -1,236 +1,275 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11010100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# REW [raw] {11010100-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11010100-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# F_SRCH [raw] {11010100-100000}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11010100-100001}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
-name: PLAY_MODE
+# PLAY_MODE [20 36 10] {110-10100--100100-001010}
+name: PLAY_MODE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# 1 [raw] {11010100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
-name: ENTER
+# ENTER [20 41 10] {110-10100--101001-001010}
+name: ENTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: TRACK
+# TRACK [20 32 0] {110-10100--100000-000000}
+name: TRACK (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
+# DISC [raw] {11110100-011110}
 name: DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# OPEN [raw] {11110100-101101}
 name: OPEN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# CANCEL [raw] {11110100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
-name: STORE
+# STORE [20 41 11] {110-10100--101001-001011}
+name: STORE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 888 888 888 75350
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 889 889 889 75551
 #
-name: STOCK_-INFO
+# STOCK_-INFO [20 15 0] {110-10100--001111-000000}
+name: STOCK_-INFO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: UNIT
+# UNIT [20 63 0] {110-10100--111111-000000}
+name: UNIT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# AMS [raw] {11110100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
-name: NEXT_PLAY
+# NEXT_PLAY [20 36 11] {110-10100--100100-001011}
+name: NEXT_PLAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# PROGRAM [raw] {11110100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# CATEGORY [raw] {10110100-011100}
 name: CATEGORY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 5C 00 00 00
 #
+# TITLE [raw] {10110100-101101}
 name: TITLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 6D 00 00 00
 #
-name: TITLE_SEARCH
+# TITLE_SEARCH [20 109 10] {100-10100--101101-001010}
+name: TITLE_SEARCH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 5327 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 76210
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 5334 1778 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: 10+
+# 10+ [20 0 10] {110-10100--000000-001010}
+name: 10+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: 10-
+# 10- [20 0 11] {110-10100--000000-001011}
+name: 10- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# RECALL [raw] {11110100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC-870_CD_(ODD).ir b/_Converted_/Pronto/M/Marantz/CC-870_CD_(ODD).ir
index 4fe391d4..3c93aa46 100644
--- a/_Converted_/Pronto/M/Marantz/CC-870_CD_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/CC-870_CD_(ODD).ir
@@ -1,236 +1,275 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11110100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# REW [raw] {11110100-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11010100-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# F_SRCH [raw] {11110100-100000}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11010100-100001}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# RANDOM [raw] {11110100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
-name: PLAY_MODE
+# PLAY_MODE [20 36 10] {110-10100--100100-001010}
+name: PLAY_MODE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
+# REPEAT [raw] {11110100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# 1 [raw] {11010100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
-name: ENTER
+# ENTER [20 41 10] {110-10100--101001-001010}
+name: ENTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 1776 76210
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: TRACK
+# TRACK [20 32 0] {110-10100--100000-000000}
+name: TRACK (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
+# DISC [raw] {11010100-011110}
 name: DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# OPEN [raw] {11110100-101101}
 name: OPEN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# CANCEL [raw] {11010100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
-name: STORE
+# STORE [20 41 11] {110-10100--101001-001011}
+name: STORE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 888 888 888 75350
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 889 889 889 75551
 #
-name: STOCK_-INFO
+# STOCK_-INFO [20 15 0] {110-10100--001111-000000}
+name: STOCK_-INFO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: UNIT
+# UNIT [20 63 0] {110-10100--111111-000000}
+name: UNIT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# AMS [raw] {11010100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
-name: NEXT_PLAY
+# NEXT_PLAY [20 36 11] {110-10100--100100-001011}
+name: NEXT_PLAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# PROGRAM [raw] {11010100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# CATEGORY [raw] {10010100-011100}
 name: CATEGORY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 5C 00 00 00
 #
+# TITLE [raw] {10110100-101101}
 name: TITLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 6D 00 00 00
 #
-name: TITLE_SEARCH
+# TITLE_SEARCH [20 109 10] {100-10100--101101-001010}
+name: TITLE_SEARCH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 5327 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 76210
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 5334 1778 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: 10+
+# 10+ [20 0 10] {110-10100--000000-001010}
+name: 10+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: 10-
+# 10- [20 0 11] {110-10100--000000-001011}
+name: 10- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# RECALL [raw] {11110100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC38.ir b/_Converted_/Pronto/M/Marantz/CC38.ir
index e60f3f54..0bbd7b9b 100644
--- a/_Converted_/Pronto/M/Marantz/CC38.ir
+++ b/_Converted_/Pronto/M/Marantz/CC38.ir
@@ -1,74 +1,86 @@
 Filetype: IR signals file
 Version: 1
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# SCAN [raw] {11110100-101011}
 name: SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# DISC [raw] {11110100-011110}
 name: DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# O/C [raw] {11110100-101101}
 name: O/C
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# RANDOM [raw] {11110100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# R_TRK [raw] {11110100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# F_TRK [raw] {11110100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# VOL- [raw] {11110100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# VOL+ [raw] {11110100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC38_1.ir b/_Converted_/Pronto/M/Marantz/CC38_1.ir
index 8a5623c9..e13fb439 100644
--- a/_Converted_/Pronto/M/Marantz/CC38_1.ir
+++ b/_Converted_/Pronto/M/Marantz/CC38_1.ir
@@ -61,56 +61,65 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 1791 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 1791 91146
 #
-name: DISC_1
+# DISC_1 [20 1 0] {110-10100--000001-000000}
+name: DISC_1 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2
+# DISC_2 [20 2 0] {110-10100--000010-000000}
+name: DISC_2 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3
+# DISC_3 [20 3 0] {110-10100--000011-000000}
+name: DISC_3 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4
+# DISC_4 [20 4 0] {110-10100--000100-000000}
+name: DISC_4 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5
+# DISC_5 [20 5 0] {110-10100--000101-000000}
+name: DISC_5 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# TIME [raw] {11010100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# OPEN [raw] {11010100-101101}
 name: OPEN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC4001.ir b/_Converted_/Pronto/M/Marantz/CC4001.ir
index 54920c05..38e74187 100644
--- a/_Converted_/Pronto/M/Marantz/CC4001.ir
+++ b/_Converted_/Pronto/M/Marantz/CC4001.ir
@@ -1,11 +1,12 @@
 Filetype: IR signals file
 Version: 1
 #
-name: POWER_ON
+# POWER_ON [20 12 1] {110-10100--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4478 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 76006
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
 name: POWER_OFF
 type: raw
@@ -13,23 +14,26 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 896 896 1791 1791 1791 896 896 4478 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 1791 76902
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89527
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
 name: 3
 type: raw
@@ -61,11 +65,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 896 896 1791 1791 1791 896 896 896 896 896 896 896 896 1791 896 896 896 896 896 90306
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
 name: 9
 type: raw
@@ -109,11 +114,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 1791 896 896 91202
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90415
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
 name: PLAY
 type: raw
@@ -157,11 +163,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 1791 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 91230
 #
-name: DVD-ON
+# DVD-ON [20 12 1] {110-10100--001100-000001}
+name: DVD-ON (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4478 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 76006
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
 name: DVD-OFF
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/CC48_EVEN.ir b/_Converted_/Pronto/M/Marantz/CC48_EVEN.ir
index 94e41d6a..161400fb 100644
--- a/_Converted_/Pronto/M/Marantz/CC48_EVEN.ir
+++ b/_Converted_/Pronto/M/Marantz/CC48_EVEN.ir
@@ -1,59 +1,68 @@
 Filetype: IR signals file
 Version: 1
 #
+# R_TRK [raw] {11110100-100000}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11110100-100001}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# SHUFFLE [raw] {11110100-011100}
 name: SHUFFLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# DISC [raw] {11110100-011110}
 name: DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# SCAN [raw] {11110100-101011}
 name: SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
 name: OPEN/CLOSE
 type: raw
@@ -61,14 +70,16 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 1776 1776 943 89638 943 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 1776 1776 943 89638 943 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 1776 1776 943 89638 943 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 1776 1776 943 89638 943 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 943 55 749 1776 943 89638 943 943 943 943 943 943 1776 1776 1776 943 943 1776 1776 1776 943 943 1776 1776
 #
+# VOL+ [raw] {11110100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CC48_ODD.ir b/_Converted_/Pronto/M/Marantz/CC48_ODD.ir
index 90a9293c..a2ab149d 100644
--- a/_Converted_/Pronto/M/Marantz/CC48_ODD.ir
+++ b/_Converted_/Pronto/M/Marantz/CC48_ODD.ir
@@ -1,74 +1,86 @@
 Filetype: IR signals file
 Version: 1
 #
+# R_TRK [raw] {11010100-100000}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11010100-100001}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# SHUFFLE [raw] {11010100-011100}
 name: SHUFFLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# DISC [raw] {11010100-011110}
 name: DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# SCAN [raw] {11010100-101011}
 name: SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# TIME [raw] {11010100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# OPEN/CLOSE [raw] {11010100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(EVEN).ir b/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(EVEN).ir
index b5441122..aae36429 100644
--- a/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(EVEN).ir
@@ -1,314 +1,366 @@
 Filetype: IR signals file
 Version: 1
 #
+# R_TRK [raw] {11110100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11110100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11110100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# F_SRCH [raw] {11110100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# VOL+ [raw] {11110100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# CANCEL [raw] {11110100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# PROGRAM [raw] {11110100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# A/B [raw] {11110100-111011}
 name: A/B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3B 00 00 00
 #
+# AMS [raw] {11110100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# RANDOM [raw] {11110100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# RECALL [raw] {11110100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# REPEAT [raw] {11110100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# EDIT [raw] {10110100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# OPEN/CLOSE [raw] {11110100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# DIMMER [raw] {11110100-000011}
 name: DIMMER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# DISC_UP/OR_DISC [raw] {11110100-011110}
 name: DISC_UP/OR_DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90581
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# DISC_DN [raw] {11110100-011111}
 name: DISC_DN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1F 00 00 00
 #
-name: TRACK
+# TRACK [20 32 0] {110-10100--100000-000000}
+name: TRACK (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: -10
+# -10 [20 0 11] {110-10100--000000-001011}
+name: -10 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
-name: +10
+# +10 [20 0 10] {110-10100--000000-001010}
+name: +10 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: ENTER
+# ENTER [20 41 10] {110-10100--101001-001010}
+name: ENTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: STORE
+# STORE [20 41 11] {110-10100--101001-001011}
+name: STORE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 889 889 889 75551
 #
+# POWER [raw] {11110100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90609
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
-name: PLAY_MODE
+# PLAY_MODE [20 36 10] {110-10100--100100-001010}
+name: PLAY_MODE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: NEXT
+# NEXT [20 36 11] {110-10100--100100-001011}
+name: NEXT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# PROGRAM [raw] {11110100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# CATAGORY [raw] {10110100-011100}
 name: CATAGORY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90609
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 5C 00 00 00
 #
+# TITLE [raw] {10110100-101101}
 name: TITLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 6D 00 00 00
 #
-name: TITLE_SEARCH
+# TITLE_SEARCH [20 109 10] {100-10100--101101-001010}
+name: TITLE_SEARCH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 5327 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 5334 1778 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: STOCK_INFO
+# STOCK_INFO [20 15 0] {110-10100--001111-000000}
+name: STOCK_INFO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# CLEAR [raw] {11110100-111010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 1776 90997
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3A 00 00 00
 #
-name: DISC1
+# DISC1 [20 1 0] {110-10100--000001-000000}
+name: DISC1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4411 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 76654
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC2
+# DISC2 [20 2 0] {110-10100--000010-000000}
+name: DISC2 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4411 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 76654
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC3
+# DISC3 [20 3 0] {110-10100--000011-000000}
+name: DISC3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4411 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC4
+# DISC4 [20 4 0] {110-10100--000100-000000}
+name: DISC4 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4411 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC5
+# DISC5 [20 5 0] {110-10100--000101-000000}
+name: DISC5 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 4383 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
diff --git a/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(ODD).ir b/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(ODD).ir
index 31854e57..f76e50ee 100644
--- a/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/CD-63SE-CC-65SE_(ODD).ir
@@ -1,314 +1,366 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11010100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90609
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
+# R_TRK [raw] {11010100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11010100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11010100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# F_SRCH [raw] {11010100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11010100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# CANCEL [raw] {11010100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# PROGRAM [raw] {11010100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# A/B [raw] {11010100-111011}
 name: A/B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3B 00 00 00
 #
+# AMS [raw] {11010100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# RECALL [raw] {11010100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# TIME [raw] {11010100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# EDIT [raw] {10010100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# OPEN/CLOSE [raw] {11010100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# DIMMER [raw] {10010100-000111}
 name: DIMMER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 47 00 00 00
 #
+# DISC_UP/OR_DISC [raw] {11010100-011110}
 name: DISC_UP/OR_DISC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# DISC_DN [raw] {11010100-011111}
 name: DISC_DN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1F 00 00 00
 #
-name: TRACK
+# TRACK [20 32 0] {110-10100--100000-000000}
+name: TRACK (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: -10
+# -10 [20 0 11] {110-10100--000000-001011}
+name: -10 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
-name: +10
+# +10 [20 0 10] {110-10100--000000-001010}
+name: +10 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: ENTER
+# ENTER [20 41 10] {110-10100--101001-001010}
+name: ENTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: STORE
+# STORE [20 41 11] {110-10100--101001-001011}
+name: STORE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 1776 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 1778 889 889 889 75551
 #
-name: PLAY_MODE
+# PLAY_MODE [20 36 10] {110-10100--100100-001010}
+name: PLAY_MODE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
-name: NEXT
+# NEXT [20 36 11] {110-10100--100100-001011}
+name: NEXT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 889 889 1778 1778 889 889 889 889 889 889 1778 1778 1778 889 889 889 75551
 #
+# PROGRAM [raw] {11010100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# TIME [raw] {11010100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# CATEGORY [raw] {10010100-011100}
 name: CATEGORY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90609
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 5C 00 00 00
 #
+# TITLE [raw] {10010100-101101}
 name: TITLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 6D 00 00 00
 #
-name: TITLE_SEARCH
+# TITLE_SEARCH [20 109 10] {100-10100--101101-001010}
+name: TITLE_SEARCH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 5327 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 5334 1778 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: STOCK_INFO
+# STOCK_INFO [20 15 0] {110-10100--001111-000000}
+name: STOCK_INFO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# CLEAR [raw] {11010100-111010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 1776 90997
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3A 00 00 00
 #
-name: DISC1
+# DISC1 [20 1 0] {110-10100--000001-000000}
+name: DISC1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC2
+# DISC2 [20 2 0] {110-10100--000010-000000}
+name: DISC2 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC3
+# DISC3 [20 3 0] {110-10100--000011-000000}
+name: DISC3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC4
+# DISC4 [20 4 0] {110-10100--000100-000000}
+name: DISC4 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4411 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76654
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC5
+# DISC5 [20 5 0] {110-10100--000101-000000}
+name: DISC5 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4411 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76682
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
diff --git a/_Converted_/Pronto/M/Marantz/CD-63SE_(EVEN).ir b/_Converted_/Pronto/M/Marantz/CD-63SE_(EVEN).ir
index a2d46e28..14c0d4bb 100644
--- a/_Converted_/Pronto/M/Marantz/CD-63SE_(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/CD-63SE_(EVEN).ir
@@ -1,182 +1,212 @@
 Filetype: IR signals file
 Version: 1
 #
+# R_TRK [raw] {11110100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11110100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11110100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# PAUSE [raw] {11110100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# F_SRCH [raw] {11110100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# VOL+ [raw] {11110100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# CANCEL [raw] {11110100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# PROGRAM [raw] {11110100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# A/B [raw] {11110100-111011}
 name: A/B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3B 00 00 00
 #
+# AMS [raw] {11110100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# RANDOM [raw] {11110100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# RECALL [raw] {11110100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# REPEAT [raw] {11110100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# EDIT [raw] {10110100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# OPEN/CLOSE [raw] {11110100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# DIMMER [raw] {11110100-000011}
 name: DIMMER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CD-63SE_(ODD).ir b/_Converted_/Pronto/M/Marantz/CD-63SE_(ODD).ir
index b5ac8e0c..1edd5dde 100644
--- a/_Converted_/Pronto/M/Marantz/CD-63SE_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/CD-63SE_(ODD).ir
@@ -1,182 +1,212 @@
 Filetype: IR signals file
 Version: 1
 #
+# R_TRK [raw] {11010100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_TRK [raw] {11010100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_SRCH [raw] {11010100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# F_SRCH [raw] {11010100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11010100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90831
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# CANCEL [raw] {11010100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# PROGRAM [raw] {11010100-101001}
 name: PROGRAM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# A/B [raw] {11010100-111011}
 name: A/B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3B 00 00 00
 #
+# AMS [raw] {11010100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# RECALL [raw] {11010100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# TIME [raw] {11010100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# EDIT [raw] {10010100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# OPEN/CLOSE [raw] {11010100-101101}
 name: OPEN/CLOSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# DIMMER [raw] {10010100-000111}
 name: DIMMER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 47 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/CD46.ir b/_Converted_/Pronto/M/Marantz/CD46.ir
index f499792d..55645403 100644
--- a/_Converted_/Pronto/M/Marantz/CD46.ir
+++ b/_Converted_/Pronto/M/Marantz/CD46.ir
@@ -1,122 +1,142 @@
 Filetype: IR signals file
 Version: 1
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# F_TRK [raw] {11010100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# R_TRK [raw] {11010100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1803 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+# VOL+ [raw] {11010100-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1803 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010100-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 11 00 00 00
 #
+# SCAN [raw] {11010100-101011}
 name: SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# 1 [raw] {11010100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# SHUFFLE [raw] {11010100-011100}
 name: SHUFFLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1803 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/DISCREET_CODES.ir b/_Converted_/Pronto/M/Marantz/DISCREET_CODES.ir
index 76ec794c..4b9a744c 100644
--- a/_Converted_/Pronto/M/Marantz/DISCREET_CODES.ir
+++ b/_Converted_/Pronto/M/Marantz/DISCREET_CODES.ir
@@ -13,14 +13,16 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 222 1332 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444 444 444 888 444 444 888 444 444 444 83313 2663 888 444 888 444 444 444 444 1332 1332
 #
-name: TUNER-ON
+# TUNER-ON [17 12 1] {110-10001--001100-000001}
+name: TUNER-ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 3551 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 1778 889 3556 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: TUNER-OFF
+# TUNER-OFF [17 12 2] {110-10001--001100-000010}
+name: TUNER-OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 3551 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76321
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 1778 889 3556 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
diff --git a/_Converted_/Pronto/M/Marantz/DV-7100.ir b/_Converted_/Pronto/M/Marantz/DV-7100.ir
index 38a71845..125a0d2d 100644
--- a/_Converted_/Pronto/M/Marantz/DV-7100.ir
+++ b/_Converted_/Pronto/M/Marantz/DV-7100.ir
@@ -7,17 +7,19 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2663 888 444 888 444 444 444 444 1332 1332 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444 444 444 888 444 444 888 444 444 444 83507
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
 name: ANGLE
 type: raw
@@ -163,53 +165,61 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2663 888 444 888 444 444 444 444 1332 1332 444 444 444 444 444 444 444 444 888 888 444 444 888 444 444 888 888 444 444 888 888 444 444 83951
 #
+# RECORD [raw] {11100101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# PAUSE [raw] {11000101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# STOP [raw] {11100101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# RECORD2 [raw] {11010111-110111}
 name: RECORD2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 37 00 00 00
 #
+# PAUSE2 [raw] {11110111-110000}
 name: PAUSE2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# STOP2 [raw] {11010111-110110}
 name: STOP2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# MAIN-CH+ [raw] {11100000-100000}
 name: MAIN-CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# MAIN-CH- [raw] {11000000-100001}
 name: MAIN-CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
 name: MAIN-PLAY
 type: raw
@@ -253,17 +263,19 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2663 888 444 888 444 444 444 444 1332 1332 444 444 444 444 444 444 444 444 888 888 444 444 444 444 444 444 888 888 888 888 444 444 444 444 444 83507
 #
+# MAIN-VOL+ [raw] {11110000-010000}
 name: MAIN-VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# MAIN-VOL- [raw] {11010000-010001}
 name: MAIN-VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
 name: 1
 type: raw
@@ -373,8 +385,9 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 2663 888 444 888 444 444 444 444 1332 1332 444 444 444 444 444 444 444 444 888 888 444 444 888 444 444 888 888 888 444 444 444 444 888 83951
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/DVD-930.ir b/_Converted_/Pronto/M/Marantz/DVD-930.ir
index d7d1efb9..bd895386 100644
--- a/_Converted_/Pronto/M/Marantz/DVD-930.ir
+++ b/_Converted_/Pronto/M/Marantz/DVD-930.ir
@@ -193,11 +193,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 448 448 448 896 448 448 448 448 448 896 896 448 448 448 448 448 448 448 448 448 896 896 448 448 448 448 896 896 896 448 448 448 448 896 448 448 448 83422
 #
+# MUTE [raw] {11000000-001101}
 name: MUTE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 923 923 1819 923 923 923 923 923 923 923 923 923 923 923 923 923 923 1819 923 923 1819 1819 923 89607
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
 #
 name: OSD
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/LASER_DISC.ir b/_Converted_/Pronto/M/Marantz/LASER_DISC.ir
index 8c872673..221c0547 100644
--- a/_Converted_/Pronto/M/Marantz/LASER_DISC.ir
+++ b/_Converted_/Pronto/M/Marantz/LASER_DISC.ir
@@ -1,125 +1,145 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11101100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0C 00 00 00
 #
+# STOP [raw] {11101100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 36 00 00 00
 #
+# R_SRCH [raw] {11101100-101100}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2C 00 00 00
 #
+# PLAY [raw] {11101100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 35 00 00 00
 #
+# F_SRCH [raw] {11101100-101110}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2E 00 00 00
 #
+# R_CHAP [raw] {11101100-100100}
 name: R_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 24 00 00 00
 #
+# F_CHAP [raw] {11101100-011110}
 name: F_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1E 00 00 00
 #
+# PAUSE [raw] {11101100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 30 00 00 00
 #
+# R_STEP [raw] {11101100-100101}
 name: R_STEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 25 00 00 00
 #
+# F_STEP [raw] {11101100-101001}
 name: F_STEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 29 00 00 00
 #
+# 1 [raw] {11101100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11101100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11101100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11101100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11101100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11101100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11101100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11101100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11101100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11101100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 00 00 00 00
 #
 name: 10+
 type: raw
@@ -133,68 +153,79 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89666 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89666 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 89666 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 1776 888 888 888 650687
 #
+# DISPLAY [raw] {11001100-001111}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0F 00 00 00
 #
+# AUDIO_D/A [raw] {11001100-100011}
 name: AUDIO_D/A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 23 00 00 00
 #
+# PGM [raw] {11001100-011111}
 name: PGM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1F 00 00 00
 #
+# CHP/TM [raw] {11001100-001010}
 name: CHP/TM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 1776 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0A 00 00 00
 #
+# RANDOM [raw] {11001100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1C 00 00 00
 #
+# HILITE [raw] {10001100-101110}
 name: HILITE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 6E 00 00 00
 #
+# SIDE_A [raw] {10001100-110010}
 name: SIDE_A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 72 00 00 00
 #
+# SIDE_B [raw] {10001100-110011}
 name: SIDE_B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 73 00 00 00
 #
+# MULTI_SPEED+ [raw] {11001100-101000}
 name: MULTI_SPEED+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 28 00 00 00
 #
+# MULTI_SPEED- [raw] {11001100-100010}
 name: MULTI_SPEED-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 22 00 00 00
 #
+# CLEAR [raw] {11101100-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 31 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/LV_500_(LD)_DD92_(DCC)_CC_52_(CD).ir b/_Converted_/Pronto/M/Marantz/LV_500_(LD)_DD92_(DCC)_CC_52_(CD).ir
index b9f3e32b..375b6e8e 100644
--- a/_Converted_/Pronto/M/Marantz/LV_500_(LD)_DD92_(DCC)_CC_52_(CD).ir
+++ b/_Converted_/Pronto/M/Marantz/LV_500_(LD)_DD92_(DCC)_CC_52_(CD).ir
@@ -1,245 +1,285 @@
 Filetype: IR signals file
 Version: 1
 #
+# TUNE- [raw] {11100101-100001}
 name: TUNE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89915
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# TUNE+ [raw] {11100101-100000}
 name: TUNE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90803
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# RECORD [raw] {11100101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89915
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89888
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR [raw] {11100101-001100}
 name: VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90775
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# VCR_REW [raw] {11100101-110010}
 name: VCR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90775
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR_FFWD [raw] {11100101-110100}
 name: VCR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90775
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR_STOP [raw] {11100101-110110}
 name: VCR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90775
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR_PLAY [raw] {11000101-110101}
 name: VCR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89888
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR_TV/VCR [raw] {11000101-111110}
 name: VCR_TV/VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90803
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# CH- [raw] {11000000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89943
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# CH+ [raw] {11000000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# TV_TV/VCR [raw] {11000000-111000}
 name: TV_TV/VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 38 00 00 00
 #
+# TV [raw] {11000000-001100}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0C 00 00 00
 #
+# 1 [raw] {11000000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 89971
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11000000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11000000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11000000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11000000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89943
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11000000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11000000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89943
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100000-001010}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 90803
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0A 00 00 00
 #
+# 11/F/P [raw] {11100000-001011}
 name: 11/F/P
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0B 00 00 00
 #
+# 12/./.. [raw] {11100000-111100}
 name: 12/./..
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 888 888 90859
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3C 00 00 00
 #
+# MUTE [raw] {11100000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89943
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
 #
+# LD_EJECT [raw] {11101100-101101}
 name: LD_EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89888
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2D 00 00 00
 #
+# LD_STOP [raw] {11101100-110110}
 name: LD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 1776 90775
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 36 00 00 00
 #
+# LD_PAUSE [raw] {11101100-110000}
 name: LD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90803
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 30 00 00 00
 #
+# LD_PLAY [raw] {11101100-110101}
 name: LD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89888
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 35 00 00 00
 #
+# LD [raw] {11101100-001100}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90803
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0C 00 00 00
 #
+# DISC_REW [raw] {11101100-101100}
 name: DISC_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 90775
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2C 00 00 00
 #
+# DISC_FFWD [raw] {11101100-101110}
 name: DISC_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 90775
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2E 00 00 00
 #
+# DISC_R_STEP [raw] {11101100-100100}
 name: DISC_R_STEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 888 90775
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 24 00 00 00
 #
+# DISC_F_STEP [raw] {11101100-011110}
 name: DISC_F_STEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90803
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1E 00 00 00
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11110010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11110111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89971
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
 name: POWER
 type: raw
@@ -247,23 +287,26 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4411 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 77126
 #
+# DBS [raw] {11101000-111111}
 name: DBS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 08 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
 name: AUX
 type: raw
@@ -271,23 +314,26 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4411 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 77126
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90859
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
 name: DOLBY_SURR
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/MV-5100.ir b/_Converted_/Pronto/M/Marantz/MV-5100.ir
index e79cd99b..8c447690 100644
--- a/_Converted_/Pronto/M/Marantz/MV-5100.ir
+++ b/_Converted_/Pronto/M/Marantz/MV-5100.ir
@@ -1,308 +1,359 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11000101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
+# CH+ [raw] {11100101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11000101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# SELECT [raw] {11100101-111110}
 name: SELECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# AUDIO [raw] {11000101-100011}
 name: AUDIO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# OTR [raw] {11100101-100111}
 name: OTR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 27 00 00 00
 #
+# RECORD [raw] {11000101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# STOP [raw] {11000101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PLAYX2 [raw] {11100101-101010}
 name: PLAYX2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 2A 00 00 00
 #
+# SLOW [raw] {11000101-101000}
 name: SLOW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 28 00 00 00
 #
+# STILL [raw] {11100101-101001}
 name: STILL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# SKIP [raw] {10000101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
+# VIS+ [raw] {10100101-110000}
 name: VIS+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 70 00 00 00
 #
+# VIS- [raw] {10000101-110001}
 name: VIS-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 71 00 00 00
 #
+# MENU [raw] {11100101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# STAT [raw] {11000101-001111}
 name: STAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# CLEAR [raw] {11100101-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# GOTO [raw] {11000101-110011}
 name: GOTO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 33 00 00 00
 #
+# PLUS [raw] {10100101-000101}
 name: PLUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 45 00 00 00
 #
+# MAIN-CH+ [raw] {11000101-100000}
 name: MAIN-CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# MAIN-CH- [raw] {11100101-100001}
 name: MAIN-CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# MAIN-PLAY [raw] {11000101-110101}
 name: MAIN-PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# MAIN-PAUSE [raw] {11100101-101001}
 name: MAIN-PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# MAIN-STOP [raw] {11000101-110110}
 name: MAIN-STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# MAIN-R_SRCH [raw] {11100101-100001}
 name: MAIN-R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# MAIN-F_SRCH [raw] {11000101-100000}
 name: MAIN-F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# MAIN-REW [raw] {11100101-110010}
 name: MAIN-REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# MAIN-FFWD [raw] {11000101-110100}
 name: MAIN-FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# MAIN-VOL+ [raw] {11110000-010000}
 name: MAIN-VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# MAIN-VOL- [raw] {11010000-010001}
 name: MAIN-VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11100101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11000101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11000101-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11000101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11000101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11000101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# MEM [raw] {11100101-111011}
 name: MEM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
+# CLEAR2 [raw] {11000101-111010}
 name: CLEAR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# UP [raw] {10110000-010000}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 50 00 00 00
 #
+# LEFT [raw] {10110000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# OK [raw] {10010000-010010}
 name: OK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# RIGHT [raw] {10110000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# DOWN [raw] {10010000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/MV-830.ir b/_Converted_/Pronto/M/Marantz/MV-830.ir
index 59ac3f38..1ec3a9e5 100644
--- a/_Converted_/Pronto/M/Marantz/MV-830.ir
+++ b/_Converted_/Pronto/M/Marantz/MV-830.ir
@@ -1,83 +1,96 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11100101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# TV/VCR [raw] {11100101-111110}
 name: TV/VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# 1 [raw] {11100101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100101-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# DISPLAY [raw] {11100101-111100}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3C 00 00 00
 #
 name: TIMER
 type: raw
@@ -85,29 +98,33 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1707 896 896 896 896 1707 1707 1707 896 896 896 896 896 896 896 896 1707 1707 896 86136 896 896 1707 896 896 896 896 1707 1707 1707 896 896 896 896 896 896 896 896 1707 1707 896 86136 896 896 1707 896 896 896 896 1707 1707 1707 896 896 896 896 896 896 896 896 1707 1707 896 86136 896 896 1707 896 896 896 896 1707 1707 1707 896 896 896 896 896 896 896 896 1707 1707 896 86136 896 896 1707 896 896 896 896 1707 1707 1707 896 896 896 896 896 896 896 896 1707 1707 896 896
 #
+# STATUS [raw] {11000101-001111}
 name: STATUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# SP/SLP [raw] {11100101-111010}
 name: SP/SLP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# CANCEL [raw] {11100101-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# MEMO [raw] {11100101-111011}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
 name: MATRIX_SURR
 type: raw
@@ -115,11 +132,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 1763 868 868 868 868 868 868 1763 1763 1763 1763 868 868 868 868 868 868 868 868 868 868 86780 1763 868 868 868 868 868 868 1763 1763 1763 1763 868 868 868 868 868 868 868 868 868 868 86780 1763 868 868 868 868 868 868 1763 1763 1763 1763 868 868 868 868 868 868 868 868 868 868 86780 1763 868 868 868 868 868 868 1763 1763 1763 1763 868 868 868 868 868 868 868 868 868 868 86780 1763 868 868 868 868 868 868 1763 1763 1763 1763 868 868 868 868 868 868 868 868 868 868 868
 #
+# SKIP [raw] {10000101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
 name: VOL+
 type: raw
@@ -133,17 +151,19 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 868 868 1707 868 868 868 868 868 868 868 868 868 868 868 868 1707 1707 868 868 868 868 1707 868 85941 868 868 1707 868 868 868 868 868 868 868 868 868 868 868 868 1707 1707 868 868 868 868 1707 868 85941 868 868 1707 868 868 868 868 868 868 868 868 868 868 868 868 1707 1707 868 868 868 868 1707 868 85941 868 868 1707 868 868 868 868 868 868 868 868 868 868 868 868 1707 1707 868 868 868 868 1707 868 85941 868 868 1707 868 868 868 868 868 868 868 868 868 868 868 868 1707 1707 868 868 868 868 1707 868 868
 #
+# CH+ [raw] {11100101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
 name: REW
 type: raw
@@ -151,41 +171,47 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 868 868 1763 868 868 868 868 1763 1763 1763 868 868 868 868 1763 868 868 1763 1763 87004 868 868 1763 868 868 868 868 1763 1763 1763 868 868 868 868 1763 868 868 1763 1763 87004 868 868 1763 868 868 868 868 1763 1763 1763 868 868 868 868 1763 868 868 1763 1763 87004 868 868 1763 868 868 868 868 1763 1763 1763 868 868 868 868 1763 868 868 1763 1763 87004 868 868 1763 868 868 868 868 1763 1763 1763 868 868 868 868 1763 868 868 1763 1763 1763
 #
+# PLAY [raw] {11100101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# FFWD [raw] {11100101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# RECORD [raw] {11000101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# STOP [raw] {11100101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# MENU [raw] {11100101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
 name: OK
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/MV-880.ir b/_Converted_/Pronto/M/Marantz/MV-880.ir
index 5ec57e41..e61da5ba 100644
--- a/_Converted_/Pronto/M/Marantz/MV-880.ir
+++ b/_Converted_/Pronto/M/Marantz/MV-880.ir
@@ -1,62 +1,72 @@
 Filetype: IR signals file
 Version: 1
 #
+# PLAY [raw] {11000101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# STOP [raw] {11000101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# REW [raw] {11100101-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11000101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# RECORD [raw] {11100101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# CH+ [raw] {11000101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/Marantz_SA_CD_Player.ir b/_Converted_/Pronto/M/Marantz/Marantz_SA_CD_Player.ir
index cadfe5c7..bca119d4 100644
--- a/_Converted_/Pronto/M/Marantz/Marantz_SA_CD_Player.ir
+++ b/_Converted_/Pronto/M/Marantz/Marantz_SA_CD_Player.ir
@@ -1,242 +1,322 @@
 Filetype: IR signals file
 Version: 1
 #
+#
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+#
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 888 888 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+#
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 888 888 888 888 1831 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+#
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 888 888 1831 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+#
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 888 888 1831 1831 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+#
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 1831 1831 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+#
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 888 888 1831 888 888 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+#
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 1831 888 888 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+#
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 1831 1831 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+#
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 1831 1831 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+#
+# R_SRCH [raw] {11010100-110010}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 888 888 1831 888 888 1831 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+#
+# F_SRCH [raw] {11110100-110100}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 1831 888 888 1831 1831 1831 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+#
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 888 888 1831 888 888 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+#
+# PLAY [raw] {11110100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 1831 888 888 1831 1831 1831 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+#
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 888 888 1831 1831 888 888 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+#
+# ENTER [raw] {10110100-010111}
 name: ENTER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 888 888 1831 1831 1831 888 888 888 888 1831 1831 1831 888 888 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 57 00 00 00
 #
+#
+# FSCAN [raw] {11110100-100000}
 name: FSCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 1831 1831 888 888 888 888 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+#
+# RSCAN [raw] {11010100-100001}
 name: RSCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 1831 888 888 888 888 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+#
+# SOUND_MODE [raw] {10110100-000010}
 name: SOUND_MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 888 888 1831 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 42 00 00 00
 #
+#
+# EJECT [raw] {11010100-101101}
 name: EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 1831 1831 888 888 1831 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
-name: QCK_REPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 5327 888 888 1831 1831 1831 1831 1831 888 888 888 888 1831 1831 888 888 76543
 #
+# QCK_REPLAY [20 53 4] {110-10100--110101-000100}
+name: QCK_REPLAY (raw)
+type: raw
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 889 889 1778 1778 1778 1778 1778 889 889 889 889 1778 1778 889 889 76440
+#
+#
+# AMS [raw] {11110100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 1831 1831 1831 1831 1831 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+#
+# A-B [raw] {11010100-111011}
 name: A-B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 888 888 888 888 1831 1831 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3B 00 00 00
 #
+#
+# REPEAT_ALL [raw] {11010100-011101}
 name: REPEAT_ALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 1831 888 888 888 888 1831 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
+#
+# PRG [raw] {11110100-101001}
 name: PRG
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 1831 1831 1831 1831 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+#
+# CANCEL [raw] {11010100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 1831 888 888 1831 888 888 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+#
+# RANDOM [raw] {11110100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 1831 888 888 888 888 1831 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+#
+# DISPLAY [raw] {10110100-000111}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 916 916 1831 1831 1831 916 916 916 916 916 916 916 916 1831 916 916 916 916 916 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 47 00 00 00
 #
+#
+# TIME [raw] {11110100-001011}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 1831 1831 888 888 888 888 888 888 1831 1831 1831 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+#
+# TEXT [raw] {10010100-011000}
 name: TEXT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 888 888 1831 1831 1831 1831 888 888 888 888 1831 888 888 1831 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 58 00 00 00
 #
+#
+# MENU [raw] {10110100-010010}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 888 888 1831 1831 1831 888 888 888 888 1831 1831 888 888 1831 1831 90886
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 52 00 00 00
 #
+#
+# RECALL_SCROLL [raw] {11010100-001111}
 name: RECALL_SCROLL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 888 888 888 888 1831 888 888 888 888 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
-name: INPUT_UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 888 888 888 888 888 888 4467 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1831 888 888 1831 1831 888 75655
 #
-name: INPUT_DWN
+# INPUT_UP [16 0 13] {110-10000--000000-001101}
+name: INPUT_UP (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 888 888 888 888 888 888 4467 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1831 888 888 888 888 1831 76543
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 1778 889 75551
 #
+#
+# INPUT_DWN [16 0 14] {110-10000--000000-001110}
+name: INPUT_DWN (raw)
+type: raw
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 889 1778 76440
+#
+#
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1831 888 888 888 888 888 888 888 888 1831 1831 888 888 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+#
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 888 888 888 888 888 888 888 888 1831 1831 888 888 888 888 1831 888 90026
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
-name: NOISE_SHARPER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 916 916 1831 1831 1831 916 916 4439 916 916 916 1831 916 916 1831 1831 1831 916 916 916 916 1831 916 916 1831 76543
 #
-name: DC_FILTER
+# NOISE_SHARPER [20 77 6] {100-10100--001101-000110}
+name: NOISE_SHARPER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 916 916 1831 1831 1831 1831 916 916 4439 916 916 916 1831 916 916 1831 1831 1831 916 916 1831 1831 916 916 916 916 76543
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 1778 1778 1778 889 889 889 889 1778 889 889 1778 76440
 #
-name: FILTER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1831 1831 916 916 1831 1831 1831 916 916 4439 916 916 916 1831 916 916 1831 1831 1831 916 916 916 916 1831 1831 1831 916 75683
 #
-name: DIG_OUT_OFF
+# DC_FILTER [20 77 8] {100-10100--001101-001000}
+name: DC_FILTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1831 1831 1831 1831 1831 888 888 5327 888 888 888 888 888 888 888 888 888 888 1831 888 888 1831 888 888 1831 1831 888 75683
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 889 889 76440
+#
+#
+# FILTER [20 77 5] {100-10100--001101-000101}
+name: FILTER (raw)
+type: raw
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 1778 1778 1778 1778 889 889 4445 889 889 889 1778 889 889 1778 1778 1778 889 889 889 889 1778 1778 1778 889 75551
+#
+#
+# DIG_OUT_OFF [20 63 13] {110-10100--111111-001101}
+name: DIG_OUT_OFF (raw)
+type: raw
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 889 889 1778 1778 889 75551
diff --git a/_Converted_/Pronto/M/Marantz/NR_Series.ir b/_Converted_/Pronto/M/Marantz/NR_Series.ir
index 24fb2b93..b7cf7886 100644
Binary files a/_Converted_/Pronto/M/Marantz/NR_Series.ir and b/_Converted_/Pronto/M/Marantz/NR_Series.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/PD4290D.ir b/_Converted_/Pronto/M/Marantz/PD4290D.ir
index 2c0a1ba3..08f90ce9 100644
--- a/_Converted_/Pronto/M/Marantz/PD4290D.ir
+++ b/_Converted_/Pronto/M/Marantz/PD4290D.ir
@@ -79,17 +79,19 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 9019 4444 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 552 552 552 552 1657 552 552 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 1657 552 1657 552 552 552 552 552 44256 9019 2183 552 95822
 #
+# CH+ [raw] {11000000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
 name: VOL+
 type: raw
@@ -103,77 +105,89 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 9019 4444 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 1657 552 39759 9019 2183 552 95822
 #
+# 1 [raw] {11000000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11000000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11000000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11000000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11000000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100000-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# M [raw] {11000000-101001}
 name: M
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 29 00 00 00
 #
+# C [raw] {11100000-110001}
 name: C
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 31 00 00 00
 #
 name: UP
 type: raw
@@ -211,11 +225,12 @@ frequency: 38029
 duty_cycle: 0.330000
 data: 9019 4444 552 552 552 552 552 552 552 1657 552 1657 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 1657 552 1657 552 1657 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 552 1657 552 1657 552 1657 552 1657 552 39759 9019 2183 552 95822
 #
+# GUIDE [raw] {11000011-101110}
 name: GUIDE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 03 00 00 00
+command: 2E 00 00 00
 #
 name: MUTE
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/PDM-510.ir b/_Converted_/Pronto/M/Marantz/PDM-510.ir
index 2b4203b4..700aa90b 100644
--- a/_Converted_/Pronto/M/Marantz/PDM-510.ir
+++ b/_Converted_/Pronto/M/Marantz/PDM-510.ir
@@ -1,68 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
+# Deck-A [raw] {11110010-101100}
 name: Deck-A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# Deck-B [raw] {11110010-101110}
 name: Deck-B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# Reset [raw] {11010010-110001}
 name: Reset
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 31 00 00 00
 #
+# Pause [raw] {11010010-110000}
 name: Pause
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# Record [raw] {11010010-110111}
 name: Record
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# Record-MUTE [raw] {11110010-101010}
 name: Record-MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# Play [raw] {11110010-110101}
 name: Play
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89693
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# Unknown [raw] {11010010-101111}
 name: Unknown
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# Rewind [raw] {11110010-110010}
 name: Rewind
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# Stop [raw] {11110010-110110}
 name: Stop
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# Forward [raw] {11110010-110100}
 name: Forward
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90581
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/PMD-370.ir b/_Converted_/Pronto/M/Marantz/PMD-370.ir
index 937c3b78..d64c4fe3 100644
--- a/_Converted_/Pronto/M/Marantz/PMD-370.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD-370.ir
@@ -1,188 +1,219 @@
 Filetype: IR signals file
 Version: 1
 #
+# EDIT [raw] {10010100-101000}
 name: EDIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 68 00 00 00
 #
+# RECALL [raw] {11110100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# CLEAR [raw] {11010100-111010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 1776 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3A 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010100-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# MEMO [raw] {11110100-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 90026
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
-name: DISC_1
+# DISC_1 [20 1 0] {110-10100--000001-000000}
+name: DISC_1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 76599
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2
+# DISC_2 [20 2 0] {110-10100--000010-000000}
+name: DISC_2 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3
+# DISC_3 [20 3 0] {110-10100--000011-000000}
+name: DISC_3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4383 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4
+# DISC_4 [20 4 0] {110-10100--000100-000000}
+name: DISC_4 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 4383 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76599
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5
+# DISC_5 [20 5 0] {110-10100--000101-000000}
+name: DISC_5 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 4383 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# R_SRCH [raw] {11010100-100001}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# F_SRCH [raw] {11110100-100000}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# DISC-SELECT [raw] {11010100-011110}
 name: DISC-SELECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1E 00 00 00
 #
+# REW [raw] {11110100-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# FFWD [raw] {11110100-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90692
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# STOP [raw] {11110100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90914
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# AMS [raw] {11010100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# TIME_DISPLAY [raw] {11110100-001011}
 name: TIME_DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89804
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/PMD-512.ir b/_Converted_/Pronto/M/Marantz/PMD-512.ir
index 31e06143..919dc527 100644
--- a/_Converted_/Pronto/M/Marantz/PMD-512.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD-512.ir
@@ -1,68 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
+# DECK-A [raw] {11110010-101100}
 name: DECK-A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK-B [raw] {11110010-101110}
 name: DECK-B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# RESET [raw] {11110010-110001}
 name: RESET
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 31 00 00 00
 #
+# RECORD [raw] {11010010-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# PAUSE [raw] {11110010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# RECORD-MUTE [raw] {11010010-101010}
 name: RECORD-MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# SEARCH [raw] {11110010-101111}
 name: SEARCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# STOP [raw] {11110010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(CD_FNX).ir b/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(CD_FNX).ir
index 6c608b9f..7b03cadd 100644
--- a/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(CD_FNX).ir
+++ b/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(CD_FNX).ir
@@ -1,188 +1,219 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11110100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TRAY [raw] {11110100-101101}
 name: TRAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2D 00 00 00
 #
+# 1 [raw] {11110100-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110100-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110100-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110100-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110100-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110100-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110100-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110100-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110100-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 09 00 00 00
 #
+# CD* [raw] {11110100-000000}
 name: CD*
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 00 00 00 00
 #
+# R_TRK [raw] {11010100-100001}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# F_TRK [raw] {11010100-100000}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# PLAY [raw] {11010100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# <> [raw] {11010010-101111}
 name: <>
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# R_SCAN [raw] {11010100-110010}
 name: R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# F_SCAN [raw] {11010100-110100}
 name: F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11010100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11010100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# >> [raw] {11010100-110100}
 name: >>
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# AMS [raw] {11010100-101011}
 name: AMS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 2B 00 00 00
 #
+# DISPLAY [raw] {11010100-001011}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
+# MEMO [raw] {11010010-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# RANDOM [raw] {11010100-011100}
 name: RANDOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1C 00 00 00
 #
+# PROG [raw] {11010100-101001}
 name: PROG
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 29 00 00 00
 #
+# RECALL [raw] {11010100-001111}
 name: RECALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0F 00 00 00
 #
+# CANCEL [raw] {11010100-110001}
 name: CANCEL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 31 00 00 00
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
-name: DOOR
+# DOOR [20 45 10] {110-10100--101101-001010}
+name: DOOR (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 5327 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 5334 1778 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 76440
diff --git a/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(TAPE_FNX).ir b/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(TAPE_FNX).ir
index 689c1d6a..f1da91a6 100644
--- a/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(TAPE_FNX).ir
+++ b/_Converted_/Pronto/M/Marantz/PMD350_CD-TAPE_UNIT_(TAPE_FNX).ir
@@ -1,92 +1,107 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11110100-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0C 00 00 00
 #
+# TAPE [raw] {11010010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# TRAY [raw] {11010010-101101}
 name: TRAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2D 00 00 00
 #
+# R_SRCH [raw] {11010010-100001}
 name: R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# <> [raw] {11010010-101111}
 name: <>
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# F_SRCH [raw] {11010010-100000}
 name: F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# STOP [raw] {11010010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11010010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# RECORD_@ [raw] {11110010-110111}
 name: RECORD_@
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# RECORD_0 [raw] {11110010-101010}
 name: RECORD_0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
-name: LEVEL+
+# LEVEL+ [18 16 1] {110-10010--010000-000001}
+name: LEVEL+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 4439 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 1778 1778 4445 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: LEVEL-
+# LEVEL- [18 17 1] {110-10010--010001-000001}
+name: LEVEL- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 888 888 888 888 1776 888 888 1776 1776 4439 888 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 1778 1778 4445 889 1778 1778 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
diff --git a/_Converted_/Pronto/M/Marantz/PMD370.ir b/_Converted_/Pronto/M/Marantz/PMD370.ir
index 5ec4af15..8beddef5 100644
--- a/_Converted_/Pronto/M/Marantz/PMD370.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD370.ir
@@ -61,35 +61,40 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 896 896 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 1791 91146
 #
-name: DISC_1
+# DISC_1 [20 1 0] {110-10100--000001-000000}
+name: DISC_1 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2
+# DISC_2 [20 2 0] {110-10100--000010-000000}
+name: DISC_2 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3
+# DISC_3 [20 3 0] {110-10100--000011-000000}
+name: DISC_3 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4
+# DISC_4 [20 4 0] {110-10100--000100-000000}
+name: DISC_4 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5
+# DISC_5 [20 5 0] {110-10100--000101-000000}
+name: DISC_5 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
 name: EDIT
 type: raw
@@ -115,11 +120,12 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 916 888 1776 1776 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 90248
 #
+# REPEAT [raw] {11010100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 90221
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
 name: TIME_DISPLAY
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/PMD370_-_ODD.ir b/_Converted_/Pronto/M/Marantz/PMD370_-_ODD.ir
index 416e555e..bd40da06 100644
--- a/_Converted_/Pronto/M/Marantz/PMD370_-_ODD.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD370_-_ODD.ir
@@ -61,35 +61,40 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 1791 1791 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 1791 91146
 #
-name: DISC_1
+# DISC_1 [20 1 0] {110-10100--000001-000000}
+name: DISC_1 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_2
+# DISC_2 [20 2 0] {110-10100--000010-000000}
+name: DISC_2 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_3
+# DISC_3 [20 3 0] {110-10100--000011-000000}
+name: DISC_3 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_4
+# DISC_4 [20 4 0] {110-10100--000100-000000}
+name: DISC_4 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 76790
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: DISC_5
+# DISC_5 [20 5 0] {110-10100--000101-000000}
+name: DISC_5 (raw)
 type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 1791 896 896 4394 896 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 76818
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 1778 1778 889 889 4445 889 889 889 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
 name: EDIT
 type: raw
@@ -115,11 +120,12 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 916 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 90248
 #
+# REPEAT [raw] {11110100-011101}
 name: REPEAT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 1776 888 90221
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 1D 00 00 00
 #
 name: TIME_DISPLAY
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK.ir b/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK.ir
index 6e3d1e04..d0a8b5f9 100644
--- a/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK.ir
@@ -1,350 +1,408 @@
 Filetype: IR signals file
 Version: 1
 #
+# <>-1 [raw] {11110010-101111}
 name: <>-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# DECK_A-1 [raw] {11010010-101100}
 name: DECK_A-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B-1 [raw] {11110010-101110}
 name: DECK_B-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# CONT-1 [raw] {11010010-100100}
 name: CONT-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 24 00 00 00
 #
+# R_MODE-1 [raw] {11110010-011101}
 name: R_MODE-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 1791 868 868 868 868 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 1D 00 00 00
 #
+# UP_ARROW-1 [raw] {11010010-010000}
 name: UP_ARROW-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# DN_ARROW-1 [raw] {11110010-010001}
 name: DN_ARROW-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
 #
+# MEMO-1 [raw] {11010010-101001}
 name: MEMO-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 840 840 1819 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# AMS-1 [raw] {11110010-101011}
 name: AMS-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 1819 1819 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2B 00 00 00
 #
+# COUNTER-1 [raw] {11010010-001111}
 name: COUNTER-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0F 00 00 00
 #
+# ()-1 [raw] {11110010-101010}
 name: ()-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 1819 1819 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# 0-1 [raw] {11010010-000000}
 name: 0-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# 1-1 [raw] {11110010-000001}
 name: 1-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2-1 [raw] {11010010-000010}
 name: 2-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3-1 [raw] {11110010-000011}
 name: 3-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4-1 [raw] {11010010-000100}
 name: 4-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5-1 [raw] {11010010-000101}
 name: 5-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6-1 [raw] {11110010-000110}
 name: 6-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7-1 [raw] {11010010-000111}
 name: 7-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8-1 [raw] {11110010-001000}
 name: 8-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 1791 1791 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9-1 [raw] {11010010-001001}
 name: 9-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 1791 868 868 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# |<<-1 [raw] {11110010-100001}
 name: |<<-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 1791 1791 868 868 868 868 868 868 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# >>|-1 [raw] {11010010-100000}
 name: >>|-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# <<-1 [raw] {11110010-110010}
 name: <<-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# >>-1 [raw] {11010010-110100}
 name: >>-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# >-1 [raw] {11110010-110101}
 name: >-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ||-1 [raw] {11010010-110000}
 name: ||-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# []-1 [raw] {11110010-110110}
 name: []-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# *-1 [raw] {11010010-110111}
 name: *-1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# <>-2 [raw] {11010010-101111}
 name: <>-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# DECK_A-2 [raw] {11110010-101100}
 name: DECK_A-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B-2 [raw] {11010010-101110}
 name: DECK_B-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# CONT-2 [raw] {11110010-100100}
 name: CONT-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 24 00 00 00
 #
+# R_MODE-2 [raw] {11010010-011101}
 name: R_MODE-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 1791 868 868 868 868 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 1D 00 00 00
 #
+# UP_ARROW-2 [raw] {11110010-010000}
 name: UP_ARROW-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# DN_ARROW-2 [raw] {11010010-010001}
 name: DN_ARROW-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
 #
+# MEMO-2 [raw] {11110010-101001}
 name: MEMO-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 1819 840 840 1819 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# AMS-2 [raw] {11010010-101011}
 name: AMS-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 1819 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2B 00 00 00
 #
+# COUNTER-2 [raw] {11110010-001111}
 name: COUNTER-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0F 00 00 00
 #
+# ()-2 [raw] {11010010-101010}
 name: ()-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 1819 1819 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# 0-2 [raw] {11110010-000000}
 name: 0-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# 1-2 [raw] {11010010-000001}
 name: 1-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2-2 [raw] {11110010-000010}
 name: 2-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3-2 [raw] {11010010-000011}
 name: 3-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4-2 [raw] {11110010-000100}
 name: 4-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5-2 [raw] {11110010-000101}
 name: 5-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 868 868 1791 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6-2 [raw] {11010010-000110}
 name: 6-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7-2 [raw] {11110010-000111}
 name: 7-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8-2 [raw] {11010010-001000}
 name: 8-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 1791 1791 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9-2 [raw] {11110010-001001}
 name: 9-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 1791 1791 868 868 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# |<<-2 [raw] {11010010-100001}
 name: |<<-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# >>|-2 [raw] {11110010-100000}
 name: >>|-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# <<-2 [raw] {11010010-110010}
 name: <<-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# >>-2 [raw] {11110010-110100}
 name: >>-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# >-2 [raw] {11010010-110101}
 name: >-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ||-2 [raw] {11110010-110000}
 name: ||-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# []-2 [raw] {11010010-110110}
 name: []-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# *-2 [raw] {11110010-110111}
 name: *-2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1791 840 840 1791 1791 1791 840 840 1791 1791 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK_1.ir b/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK_1.ir
index f3f62229..978b3775 100644
--- a/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK_1.ir
+++ b/_Converted_/Pronto/M/Marantz/PMD500U_PROFESSIONAL_STEREO_DOUBLE_CASSETTE_DECK_1.ir
@@ -1,176 +1,205 @@
 Filetype: IR signals file
 Version: 1
 #
+# <> [raw] {11110010-101111}
 name: <>
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# DECK_A [raw] {11010010-101100}
 name: DECK_A
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11110010-101110}
 name: DECK_B
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# CONT [raw] {11010010-100100}
 name: CONT
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 24 00 00 00
 #
+# R_MODE [raw] {11110010-011101}
 name: R_MODE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 1791 868 868 868 868 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 1D 00 00 00
 #
+# UP_ARROW [raw] {11010010-010000}
 name: UP_ARROW
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# DN_ARROW [raw] {11110010-010001}
 name: DN_ARROW
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
 #
+# MEMO [raw] {11010010-101001}
 name: MEMO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 840 840 1819 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# AMS [raw] {11110010-101011}
 name: AMS
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 1819 1819 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2B 00 00 00
 #
+# COUNTER [raw] {11010010-001111}
 name: COUNTER
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0F 00 00 00
 #
+# () [raw] {11110010-101010}
 name: ()
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 1819 1819 1819 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# 0 [raw] {11010010-000000}
 name: 0
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# 1 [raw] {11110010-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010010-000010}
 name: 2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110010-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010010-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010010-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 1791 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110010-000110}
 name: 6
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 896 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010010-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 868 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110010-001000}
 name: 8
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 1791 1791 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010010-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 1791 868 868 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# |<< [raw] {11110010-100001}
 name: |<<
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 1791 1791 868 868 868 868 868 868 1791 868 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# >>| [raw] {11010010-100000}
 name: >>|
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# << [raw] {11110010-110010}
 name: <<
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# >> [raw] {11010010-110100}
 name: >>
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# > [raw] {11110010-110101}
 name: >
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# || [raw] {11010010-110000}
 name: ||
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90390
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# () [raw] {11110010-110110}
 name: ()
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90362
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# * [raw] {11010010-110111}
 name: *
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 840 840 840 840 840 89579
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/RECEIVER.ir b/_Converted_/Pronto/M/Marantz/RECEIVER.ir
index 94eae871..8fa8b67f 100644
--- a/_Converted_/Pronto/M/Marantz/RECEIVER.ir
+++ b/_Converted_/Pronto/M/Marantz/RECEIVER.ir
@@ -1,203 +1,236 @@
 Filetype: IR signals file
 Version: 1
 #
+# SOURCE_OFF [raw] {11100101-001100}
 name: SOURCE_OFF
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# SOURCE_ON [raw] {11100101-001100}
 name: SOURCE_ON
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 1803 860 860 1803 860 860 860 860 860 860 860 860 860 860 1803 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 4439 860 860 860 1776 860 860 1776 860 860 860 860 860 860 860 860 860 860 860 860 1776 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR [raw] {11110010-111111}
 name: ACR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11110111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
-name: THX
+# THX [16 37 36] {110-10000--100101-100100}
+name: THX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 1776 1776 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 889 889 76440
 #
-name: PRO_LOGIC
+# PRO_LOGIC [16 37 0] {110-10000--100101-000000}
+name: PRO_LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3-LOGIC
+# 3-LOGIC [16 37 24] {110-10000--100101-011000}
+name: 3-LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 860 860 1776 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 1778 889 889 889 889 76440
 #
-name: MOVIE
+# MOVIE [16 37 29] {110-10000--100101-011101}
+name: MOVIE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 1748 1748 860 860 860 860 1748 1748 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 1778 1778 889 75551
 #
-name: MONO
+# MONO [16 37 37] {110-10000--100101-100101}
+name: MONO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 860 860 1748 860 860 1748 1748 1748 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 1778 889 75551
 #
-name: MATRIX
+# MATRIX [16 37 9] {110-10000--100101-001001}
+name: MATRIX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 1776 860 860 1776 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 889 889 1778 889 75551
 #
-name: HALL
+# HALL [16 37 1] {110-10000--100101-000001}
+name: HALL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 860 860 860 860 860 860 1776 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: STEREO
+# STEREO [16 37 30] {110-10000--100101-011110}
+name: STEREO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 860 860 860 860 860 860 1776 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
-name: DELAY
+# DELAY [16 37 18] {110-10000--100101-010010}
+name: DELAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 1776 860 860 1776 1776 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 889 889 1778 1778 76440
 #
-name: 6CH
+# 6CH [16 1 3] {110-10000--000001-000011}
+name: 6CH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 1803 1803 860 860 860 860 860 860 1803 860 860 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# TV_MUTE [raw] {11100000-001101}
 name: TV_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
 #
+# TV_VOL+ [raw] {11100000-010000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 10 00 00 00
 #
+# TV_VOL- [raw] {11100000-010001}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
 #
-name: MULTI
+# MULTI [16 29 0] {110-10000--011101-000000}
+name: MULTI (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 4439 860 1776 860 860 860 860 1776 1776 1776 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# OSD [raw] {11110000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
-name: DISP
+# DISP [16 15 0] {110-10000--001111-000000}
+name: DISP (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 1803 860 860 860 860 860 860 1803 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
 name: CH_SEL
 type: raw
@@ -205,206 +238,240 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 87141 860 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 511305
 #
-name: TEST
+# TEST [16 37 21] {110-10000--100101-010101}
+name: TEST (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 1748 1748 1748 1748 1748 1748 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: TUNE+
+# TUNE+ [16 37 34] {110-10000--100101-100010}
+name: TUNE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: TUNE-
+# TUNE- [16 37 35] {110-10000--100101-100011}
+name: TUNE- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 860 860 860 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
+# TV_1 [raw] {11100000-000001}
 name: TV_1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# TV_2 [raw] {11100000-000010}
 name: TV_2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# TV_3 [raw] {11100000-000011}
 name: TV_3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# TV_4 [raw] {11100000-000100}
 name: TV_4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# TV_5 [raw] {11100000-000101}
 name: TV_5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# TV_6 [raw] {11100000-000110}
 name: TV_6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# TV_7 [raw] {11100000-000111}
 name: TV_7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# TV_8 [raw] {11100000-001000}
 name: TV_8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# TV_9 [raw] {11100000-001001}
 name: TV_9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# TV_0 [raw] {11100000-000000}
 name: TV_0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# CD_F_SRCH [raw] {11010100-100000}
 name: CD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# CD_R_SRCH [raw] {11010100-100001}
 name: CD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# CD_F_SCAN [raw] {11010100-110100}
 name: CD_F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# CD_R_SCAN [raw] {11010100-110010}
 name: CD_R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# CD_PLAY [raw] {11010100-110101}
 name: CD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# CD_STOP [raw] {11010100-110110}
 name: CD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# CD_PAUSE [raw] {11010100-110000}
 name: CD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# VCR1_PLAY [raw] {11100101-110101}
 name: VCR1_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR1_STOP [raw] {11100101-110110}
 name: VCR1_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR1_PAUSE [raw] {11100101-101001}
 name: VCR1_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR1_FFWD [raw] {11100101-100000}
 name: VCR1_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# VCR1_REW [raw] {11100101-100001}
 name: VCR1_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR1_F_SRCH [raw] {11100101-110100}
 name: VCR1_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR1_R_SRCH [raw] {11100101-110010}
 name: VCR1_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR1_REC [raw] {11100101-110111}
 name: VCR1_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# ACR_PLAY [raw] {11010010-110101}
 name: ACR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ACR_STOP [raw] {11010010-110110}
 name: ACR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# ACR_PAUSE [raw] {11010010-110000}
 name: ACR_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# ACR_FFWD [raw] {11010010-100000}
 name: ACR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# ACR_REW [raw] {11010010-100001}
 name: ACR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# ACR_REC [raw] {11010010-110111}
 name: ACR_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/RECEIVER_1.ir b/_Converted_/Pronto/M/Marantz/RECEIVER_1.ir
index eb7c31ac..25fca762 100644
--- a/_Converted_/Pronto/M/Marantz/RECEIVER_1.ir
+++ b/_Converted_/Pronto/M/Marantz/RECEIVER_1.ir
@@ -1,380 +1,443 @@
 Filetype: IR signals file
 Version: 1
 #
+# SLEEP [raw] {11010000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# TV [raw] {11000000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11001100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 1803 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11000101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11000110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
-name: AUX1
+# AUX1 [16 0 6] {110-10000--000000-000110}
+name: AUX1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1803 1748 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# TUNER [raw] {11010001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11010010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# ACR2 [raw] {11010111-111111}
 name: ACR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
-name: PRO_LOGIC
+# PRO_LOGIC [16 37 0] {110-10000--100101-000000}
+name: PRO_LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3-LOGIC
+# 3-LOGIC [16 37 24] {110-10000--100101-011000}
+name: 3-LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 860 860 1776 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 1778 889 889 889 889 76440
 #
+# DELAY [raw] {10010000-101000}
 name: DELAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 68 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1748 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# DISPLAY [raw] {11000000-001111}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0F 00 00 00
 #
-name: TEST
+# TEST [16 37 21] {110-10000--100101-010101}
+name: TEST (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: TUNE+
+# TUNE+ [16 37 34] {110-10000--100101-100010}
+name: TUNE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 1776 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: TUNE-
+# TUNE- [16 37 35] {110-10000--100101-100011}
+name: TUNE- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 860 860 860 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
+# 1 [raw] {11000000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11000000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 90526
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11000000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11000000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11000000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11000000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11000000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11000000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11000000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11000000-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 860 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# CD_F_SRCH [raw] {11110100-100000}
 name: CD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# CD_R_SRCH [raw] {11110100-100001}
 name: CD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# CD_F_SCAN [raw] {11110100-110100}
 name: CD_F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# CD_R_SCAN [raw] {11110100-110010}
 name: CD_R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# CD_PLAY [raw] {11110100-110101}
 name: CD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# CD_STOP [raw] {11110100-110110}
 name: CD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# CD_PAUSE [raw] {11110100-110000}
 name: CD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# VCR1_PLAY [raw] {11000101-110101}
 name: VCR1_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR1_STOP [raw] {11000101-110110}
 name: VCR1_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR1_PAUSE [raw] {11000101-101001}
 name: VCR1_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR1_FFWD [raw] {11000101-100000}
 name: VCR1_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# VCR1_REW [raw] {11000101-100001}
 name: VCR1_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR1_F_SRCH [raw] {11000101-110100}
 name: VCR1_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR1_R_SRCH [raw] {11000101-110010}
 name: VCR1_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR1_REC [raw] {11000101-110111}
 name: VCR1_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# ACR_PLAY [raw] {11110010-110101}
 name: ACR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ACR_STOP [raw] {11110010-110110}
 name: ACR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# ACR_PAUSE [raw] {11110010-110000}
 name: ACR_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# ACR_FFWD [raw] {11110010-100000}
 name: ACR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# ACR_REW [raw] {11110010-100001}
 name: ACR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# ACR_REC [raw] {11110010-110111}
 name: ACR_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# POWER [raw] {11010000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
+# MONO/ST [raw] {11000000-001010}
 name: MONO/ST
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0A 00 00 00
 #
-name: MODE+
+# MODE+ [16 37 10] {110-10000--100101-001010}
+name: MODE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
+# CENTR+ [raw] {10010000-100110}
 name: CENTR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 66 00 00 00
 #
+# CENTR- [raw] {10010000-100111}
 name: CENTR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 67 00 00 00
 #
+# SURR+ [raw] {10010000-000001}
 name: SURR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 41 00 00 00
 #
+# SURR- [raw] {10010000-000010}
 name: SURR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 42 00 00 00
 #
+# DSP [raw] {11010000-100101}
 name: DSP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1803 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
+# DELAY [raw] {10010000-101000}
 name: DELAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 68 00 00 00
 #
+# INPUT_CYCLE [raw] {10010000-000000}
 name: INPUT_CYCLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 40 00 00 00
 #
+# TV_VOL+ [raw] {11000000-010000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 10 00 00 00
 #
+# TV_VOL- [raw] {11000000-010001}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/RECIEVER_AV-500.ir b/_Converted_/Pronto/M/Marantz/RECIEVER_AV-500.ir
index 27d87dcd..8b2c9675 100644
--- a/_Converted_/Pronto/M/Marantz/RECIEVER_AV-500.ir
+++ b/_Converted_/Pronto/M/Marantz/RECIEVER_AV-500.ir
@@ -7,53 +7,61 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4411 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 77070
 #
+# TUNER [raw] {11010001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11110010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11010111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11001100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# DBS [raw] {11001000-111111}
 name: DBS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 08 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11000101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11000110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
 name: SURR
 type: raw
@@ -121,11 +129,12 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4411 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 77070
 #
+# OSD [raw] {11010000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
 name: PIP
 type: raw
@@ -151,23 +160,26 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 4411 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 77015
 #
+# BAL_L [raw] {11110000-011011}
 name: BAL_L
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 89860
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 1B 00 00 00
 #
+# BAL_R [raw] {11010000-011010}
 name: BAL_R
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 1776 90692
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 1A 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89860
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
 name: VOL_RST
 type: raw
@@ -199,68 +211,79 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 76987
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90775
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89860
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# PWR-LD [raw] {11101100-001100}
 name: PWR-LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 888 1776 888 888 90748
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 0C 00 00 00
 #
+# LD_EJECT [raw] {11101100-101101}
 name: LD_EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2D 00 00 00
 #
+# LD_STOP [raw] {11101100-110110}
 name: LD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 36 00 00 00
 #
+# LD_PAUSE [raw] {11101100-110000}
 name: LD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 30 00 00 00
 #
+# LD_PLAY [raw] {11101100-110101}
 name: LD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89804
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 35 00 00 00
 #
+# LD_R_SRCH [raw] {11101100-101100}
 name: LD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2C 00 00 00
 #
+# LD_F_SRCH [raw] {11101100-101110}
 name: LD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 90692
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 2E 00 00 00
 #
+# LD_R_CHAP [raw] {11101100-100100}
 name: LD_R_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 24 00 00 00
 #
+# LD_F_CHAP [raw] {11101100-011110}
 name: LD_F_CHAP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 1E 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASS.(ODD).ir b/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASS.(ODD).ir
index a73ae25f..504ca699 100644
--- a/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASS.(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASS.(ODD).ir
@@ -1,68 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
+# DECK_A [raw] {11010010-101100}
 name: DECK_A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11010010-101110}
 name: DECK_B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# REVERSE [raw] {11010010-101111}
 name: REVERSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89388
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# PAUSE [raw] {11010010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89388
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11010010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# RECORD [raw] {11010010-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89388
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# RESET [raw] {11010010-110001}
 name: RESET
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 89388
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 31 00 00 00
 #
+# RECORD_MUTE [raw] {11010010-101010}
 name: RECORD_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASSETTE.ir b/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASSETTE.ir
index d7da39a4..c103a57f 100644
--- a/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASSETTE.ir
+++ b/_Converted_/Pronto/M/Marantz/SD-455_DUAL_CASSETTE.ir
@@ -1,92 +1,107 @@
 Filetype: IR signals file
 Version: 1
 #
+# A_PLAY [raw] {11110010-110101}
 name: A_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89499
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# A_REW [raw] {11110010-110010}
 name: A_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90387
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# A_FFWD [raw] {11110010-110100}
 name: A_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90359
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# A_STOP [raw] {11110010-110110}
 name: A_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90387
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# A_PAUSE [raw] {11110010-110000}
 name: A_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90387
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# A_RECORD [raw] {11110010-110111}
 name: A_RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89499
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# A_REV [raw] {11110010-101111}
 name: A_REV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89499
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# A_SELECT [raw] {11110010-111111}
 name: A_SELECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89499
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# B_PLAY [raw] {11010111-110101}
 name: B_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 888 89499
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 35 00 00 00
 #
+# B_REW [raw] {11010111-110010}
 name: B_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 90387
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 32 00 00 00
 #
+# B_FFWD [raw] {11010111-110100}
 name: B_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 90359
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 34 00 00 00
 #
+# B_STOP [raw] {11010111-110110}
 name: B_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90387
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# B_PAUSE [raw] {11010010-110000}
 name: B_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90359
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# B_REV [raw] {11010111-101111}
 name: B_REV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 89499
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 2F 00 00 00
 #
+# B_SELECT [raw] {11010111-111111}
 name: B_SELECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89499
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD-535-555_DUAL_CASS.(EVEN).ir b/_Converted_/Pronto/M/Marantz/SD-535-555_DUAL_CASS.(EVEN).ir
index 143248c3..281164df 100644
--- a/_Converted_/Pronto/M/Marantz/SD-535-555_DUAL_CASS.(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/SD-535-555_DUAL_CASS.(EVEN).ir
@@ -1,71 +1,82 @@
 Filetype: IR signals file
 Version: 1
 #
+# DECK_A [raw] {11110010-101100}
 name: DECK_A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11110010-101110}
 name: DECK_B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# REVERSE [raw] {11110010-101111}
 name: REVERSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# PAUSE [raw] {11110010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# F_SCAN [raw] {11110010-100000}
 name: F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# PLAY [raw] {11110010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# R_SCAN [raw] {11110010-100001}
 name: R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# FFWD [raw] {11110010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11110010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# REW [raw] {11110010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# RECORD [raw] {11110010-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
 name: RECORD_PAUSE
 type: raw
@@ -73,74 +84,86 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90720 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90720 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90720 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90720 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 537106
 #
+# 1 [raw] {11110010-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110010-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010010-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010010-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010010-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010010-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010010-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110010-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 1776 1776 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110010-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 1776 1776 888 888 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110010-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# MEMO [raw] {11110010-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 888 888 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# POWER [raw] {11110010-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 1776 888 888 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0C 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD455_DUAL_CASS.(EVEN).ir b/_Converted_/Pronto/M/Marantz/SD455_DUAL_CASS.(EVEN).ir
index 8c0a6c75..6d863974 100644
--- a/_Converted_/Pronto/M/Marantz/SD455_DUAL_CASS.(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/SD455_DUAL_CASS.(EVEN).ir
@@ -1,68 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
+# DECK_A [raw] {11110010-101100}
 name: DECK_A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11110010-101110}
 name: DECK_B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# REVERSE [raw] {11110010-101111}
 name: REVERSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# PAUSE [raw] {11110010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# PLAY [raw] {11110010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# FFWD [raw] {11110010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11110010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# REW [raw] {11110010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90720
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# RECORD [raw] {11110010-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89832
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# RESET [raw] {11110010-110001}
 name: RESET
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 89388
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 31 00 00 00
 #
+# RECORD_MUTE [raw] {11110010-101010}
 name: RECORD_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90276
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD_525-535-PMD_320-500.ir b/_Converted_/Pronto/M/Marantz/SD_525-535-PMD_320-500.ir
index 66dad559..6663a413 100644
--- a/_Converted_/Pronto/M/Marantz/SD_525-535-PMD_320-500.ir
+++ b/_Converted_/Pronto/M/Marantz/SD_525-535-PMD_320-500.ir
@@ -1,68 +1,79 @@
 Filetype: IR signals file
 Version: 1
 #
+# PAUSE [raw] {11010010-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90942
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 90054
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 90942
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# MEMO [raw] {11010010-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 1776 888 888 1776 888 90054
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 90942
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# R_PLAY [raw] {11010010-101111}
 name: R_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 90054
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# STOP [raw] {11010010-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90942
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# RECORD_PAUSE [raw] {11010010-101010}
 name: RECORD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 90914
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# RECORD [raw] {11010010-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 90026
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# DECK_A [raw] {11010010-101100}
 name: DECK_A
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 90914
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11010010-101110}
 name: DECK_B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 916 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 90914
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SD_60.ir b/_Converted_/Pronto/M/Marantz/SD_60.ir
index 638c6206..0bdcf9d0 100644
--- a/_Converted_/Pronto/M/Marantz/SD_60.ir
+++ b/_Converted_/Pronto/M/Marantz/SD_60.ir
@@ -1,74 +1,86 @@
 Filetype: IR signals file
 Version: 1
 #
+# REW [raw] {11110010-110010}
 name: REW
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90222
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
 #
+# PLAY [raw] {11110010-110101}
 name: PLAY
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89439
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# FFWD [raw] {11110010-110100}
 name: FFWD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90250
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# PAUSE [raw] {11110010-110000}
 name: PAUSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90250
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# STOP [raw] {11110010-110110}
 name: STOP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90222
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# REVERSE [raw] {11110010-101111}
 name: REVERSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89439
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# R_SKIP [raw] {11110010-100001}
 name: R_SKIP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 1791 1791 868 868 868 868 868 868 1791 868 89439
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# F_SKIP [raw] {11110010-100000}
 name: F_SKIP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90250
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# DECK_A [raw] {11110010-101100}
 name: DECK_A
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90250
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11110010-101110}
 name: DECK_B
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90222
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# UP [raw] {11110010-010000}
 name: UP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90222
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# DOWN [raw] {11110010-010001}
 name: DOWN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 868 868 868 868 1791 868 868 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 89439
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR-19.ir b/_Converted_/Pronto/M/Marantz/SR-19.ir
index 5b8989ad..ac19e330 100644
--- a/_Converted_/Pronto/M/Marantz/SR-19.ir
+++ b/_Converted_/Pronto/M/Marantz/SR-19.ir
@@ -1,128 +1,149 @@
 Filetype: IR signals file
 Version: 1
 #
+# FM [raw] {11010001-101101}
 name: FM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2D 00 00 00
 #
+# AM [raw] {11110001-101110}
 name: AM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2E 00 00 00
 #
+# LW [raw] {11010001-101111}
 name: LW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2F 00 00 00
 #
+# Band [raw] {11110001-111111}
 name: Band
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# Channel+ [raw] {11010001-100000}
 name: Channel+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# Channel- [raw] {11110001-100001}
 name: Channel-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
+# 1 [raw] {11010001-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110001-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010001-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110001-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010001-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110001-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010001-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110001-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010001-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 09 00 00 00
 #
+# M [raw] {11110001-101001}
 name: M
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 29 00 00 00
 #
+# 0 [raw] {11010001-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 00 00 00 00
 #
+# Clear [raw] {11110001-111010}
 name: Clear
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 1776 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3A 00 00 00
 #
+# Volume+ [raw] {11010000-010000}
 name: Volume+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# Volume- [raw] {11110000-010001}
 name: Volume-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER).ir b/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER).ir
index 22a7a518..084d944e 100644
--- a/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER).ir
+++ b/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER).ir
@@ -1,77 +1,89 @@
 Filetype: IR signals file
 Version: 1
 #
+# STBY [raw] {11110111-001100}
 name: STBY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 1776 888 888 1776 888 888 91108
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 0C 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 90193
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 90193
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 91108
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# PHONO [raw] {11110101-111111}
 name: PHONO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
+# FM/AM [raw] {11110001-111111}
 name: FM/AM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11110010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# VCR [raw] {11100101-111111}
 name: VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11110111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
 name: PAUSE
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER)_EVEN.ir b/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER)_EVEN.ir
index c9575b41..b1b1db74 100644
--- a/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER)_EVEN.ir
+++ b/_Converted_/Pronto/M/Marantz/SR-63_(RECEIVER)_EVEN.ir
@@ -1,74 +1,86 @@
 Filetype: IR signals file
 Version: 1
 #
+# STBY [raw] {11010111-001100}
 name: STBY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 1776 888 888 91108
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 0C 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 90193
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 90193
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 91108
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# PHONO [raw] {11010101-111111}
 name: PHONO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
+# FM/AM [raw] {11010001-111111}
 name: FM/AM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11010010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# TV [raw] {11000000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# VCR [raw] {11000101-111111}
 name: VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11001100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 90165
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# DCC [raw] {11010111-111111}
 name: DCC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR-7000.ir b/_Converted_/Pronto/M/Marantz/SR-7000.ir
index 401de9c9..81738028 100644
--- a/_Converted_/Pronto/M/Marantz/SR-7000.ir
+++ b/_Converted_/Pronto/M/Marantz/SR-7000.ir
@@ -1,212 +1,247 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11110000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 90526
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 76404
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
+# CH+ [raw] {11000000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 1803 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# UP [raw] {10010000-010000}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 50 00 00 00
 #
+# DOWN [raw] {10110000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 1803 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 1803 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# LEFT [raw] {10010000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 1803 1803 1803 1803 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# RIGHT [raw] {10110000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 1803 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 1803 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# OK [raw] {10010000-010010}
 name: OK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 1803 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# CLEAR [raw] {11110001-111010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 1803 90443
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3A 00 00 00
 #
+# MEMO [raw] {11010001-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 1803 888 888 1803 1803 1803 888 888 1803 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 29 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
-name: AUTO/1
+# AUTO/1 [16 37 45] {110-10000--100101-101101}
+name: AUTO/1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 888 888 1803 1803 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 889 75551
 #
-name: DOLBY/2
+# DOLBY/2 [16 37 0] {110-10000--100101-000000}
+name: DOLBY/2 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: THX/3
+# THX/3 [16 37 36] {110-10000--100101-100100}
+name: THX/3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 888 888 1803 1803 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 889 889 76440
 #
-name: DTS/4
+# DTS/4 [16 37 46] {110-10000--100101-101110}
+name: DTS/4 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 888 888 888 888 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 889 889 1778 76440
 #
-name: HALL/5
+# HALL/5 [16 37 1] {110-10000--100101-000001}
+name: HALL/5 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 888 888 888 888 888 888 888 888 1803 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: MATRIX/6
+# MATRIX/6 [16 37 9] {110-10000--100101-001001}
+name: MATRIX/6 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 888 888 1803 1803 888 888 1803 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 889 889 1778 889 75551
 #
-name: MOVIE/7
+# MOVIE/7 [16 37 29] {110-10000--100101-011101}
+name: MOVIE/7 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 1803 888 888 888 888 1803 1803 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 1778 1778 889 75551
 #
-name: 2CH/8
+# 2CH/8 [16 37 30] {110-10000--100101-011110}
+name: 2CH/8 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 1803 888 888 888 888 888 888 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
+# OSD/9 [raw] {11010000-001111}
 name: OSD/9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
+# SLEEP/0 [raw] {11110000-100110}
 name: SLEEP/0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# MODE [raw] {11110000-100101}
 name: MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 1803 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
-name: A/D
+# A/D [16 1 1] {110-10000--000001-000001}
+name: A/D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: ATT
+# ATT [16 37 43] {110-10000--100101-101011}
+name: ATT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 1803 1803 888 888 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 889 889 889 75551
 #
-name: NIGHT
+# NIGHT [16 37 42] {110-10000--100101-101010}
+name: NIGHT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 1803 1803 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 1778 76440
 #
-name: MULTI
+# MULTI [16 29 0] {110-10000--011101-000000}
+name: MULTI (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 1803 888 888 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 6-DIR
+# 6-DIR [16 1 3] {110-10000--000001-000011}
+name: 6-DIR (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 888 888 75572
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# TREBLE+ [raw] {11010000-011000}
 name: TREBLE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 18 00 00 00
 #
+# TREBLE- [raw] {11110000-011001}
 name: TREBLE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 19 00 00 00
 #
+# BASS+ [raw] {11010000-010110}
 name: BASS+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 1803 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 16 00 00 00
 #
+# BASS- [raw] {11110000-010111}
 name: BASS-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 17 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR-7300.ir b/_Converted_/Pronto/M/Marantz/SR-7300.ir
index ef2ebc22..32ece087 100644
--- a/_Converted_/Pronto/M/Marantz/SR-7300.ir
+++ b/_Converted_/Pronto/M/Marantz/SR-7300.ir
@@ -1,11 +1,12 @@
 Filetype: IR signals file
 Version: 1
 #
+# TV [raw] {11000000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
 name: DVD
 type: raw
@@ -13,41 +14,47 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 75711
 #
+# VCR1 [raw] {11000101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# CDR [raw] {11111010-111111}
 name: CDR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 1A 00 00 00
+command: 3F 00 00 00
 #
+# MD [raw] {11010111-111111}
 name: MD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11110010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
 name: AUX1
 type: raw
@@ -61,17 +68,19 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 74601
 #
+# DSS [raw] {11000110-111111}
 name: DSS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
+# POWER [raw] {11110000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
 name: POWER_ON
 type: raw
@@ -103,11 +112,12 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 74823
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
 name: AUDIO
 type: raw
@@ -175,17 +185,19 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 74851
 #
+# 0 [raw] {11010000-100101}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
+# CLEAR [raw] {11110000-100010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 1776 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 22 00 00 00
 #
 name: +10
 type: raw
@@ -199,107 +211,124 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 75711
 #
+# INPUT [raw] {11000000-111000}
 name: INPUT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 888 888 89915
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 38 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# CH+ [raw] {11100000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 89915
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11000000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89028
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# DECK_A_BASS [raw] {11110000-010110}
 name: DECK_A_BASS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 16 00 00 00
 #
+# DECK_B_BASS [raw] {11010000-010111}
 name: DECK_B_BASS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 17 00 00 00
 #
+# DECK_A_TREBLE [raw] {11110000-011000}
 name: DECK_A_TREBLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 89943
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 18 00 00 00
 #
+# DECK_B_TREBLE [raw] {11010000-011001}
 name: DECK_B_TREBLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 1776 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 19 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 89915
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 88778
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# OSD [raw] {11010000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
+# UP [raw] {10110000-010000}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 89915
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 50 00 00 00
 #
+# LEFT [raw] {10010000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 88778
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# ENTER [raw] {10110000-010010}
 name: ENTER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 1776 89915
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# RIGHT [raw] {10010000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 89915
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# DOWN [raw] {10110000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89028
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# SETUP [raw] {10010000-010010}
 name: SETUP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 1776 89915
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
 name: CH_SEL
 type: raw
@@ -313,17 +342,19 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 1776 888 74851
 #
+# EXIT [raw] {10110000-010011}
 name: EXIT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 53 00 00 00
 #
+# SPEAKER-A/B [raw] {11010000-011101}
 name: SPEAKER-A/B
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 89055
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 1D 00 00 00
 #
 name: ATT
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/SR580.ir b/_Converted_/Pronto/M/Marantz/SR580.ir
index 52af7ba2..afdd21ff 100644
--- a/_Converted_/Pronto/M/Marantz/SR580.ir
+++ b/_Converted_/Pronto/M/Marantz/SR580.ir
@@ -163,200 +163,233 @@ frequency: 37010
 duty_cycle: 0.330000
 data: 892 865 865 865 865 865 1756 865 865 865 865 865 865 865 865 865 865 1756 865 865 1756 1756 865 87949
 #
-name: PRO-LOGIC
+# PRO-LOGIC [16 37 0] {110-10000--100101-000000}
+name: PRO-LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3-STEREO
+# 3-STEREO [16 37 24] {110-10000--100101-011000}
+name: 3-STEREO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 1748 1748 832 832 1748 832 832 832 832 76321
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 1778 889 889 889 889 76440
 #
-name: THEATER
+# THEATER [16 37 4] {110-10000--100101-000100}
+name: THEATER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1748 1748 1748 888 888 888 888 888 888 5354 1748 888 888 1748 1748 1748 1748 888 888 888 888 1748 1748 888 888 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 1778 1778 889 889 76440
 #
-name: DOLBY-DIGITAL
+# DOLBY-DIGITAL [16 37 41] {110-10000--100101-101001}
+name: DOLBY-DIGITAL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 832 832 1748 1748 1748 832 832 1748 832 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 889 889 1778 889 75551
 #
-name: HALL
+# HALL [16 37 1] {110-10000--100101-000001}
+name: HALL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: STADIUM
+# STADIUM [16 37 2] {110-10000--100101-000010}
+name: STADIUM (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 1748 832 832 832 832 832 832 1748 1748 76294
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 1778 1778 76440
 #
-name: CHURCH
+# CHURCH [16 37 3] {110-10000--100101-000011}
+name: CHURCH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 1748 860 860 860 860 860 860 1748 860 860 860 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
-name: DIGITAL-RF
+# DIGITAL-RF [16 1 10] {110-10000--000001-001010}
+name: DIGITAL-RF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 4439 832 832 832 832 832 832 832 832 832 1748 1748 832 832 1748 1748 1748 1748 76294
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: OPT
+# OPT [16 1 5] {110-10000--000001-000101}
+name: OPT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1748 1748 1748 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1748 1748 888 888 888 888 1748 1748 1748 888 75461
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 1778 1778 1778 889 75551
 #
-name: COAX
+# COAX [16 1 4] {110-10000--000001-000100}
+name: COAX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1803 832 832 832 832 832 832 4439 832 832 832 832 832 832 832 832 832 1803 1803 832 832 832 832 1803 1803 832 832 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 1778 1778 889 889 76440
 #
+# F-DIRECT [raw] {11010001-001011}
 name: F-DIRECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 1748 1748 860 860 1748 1748 1748 860 860 860 89555
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0B 00 00 00
 #
+# DISP/RDS [raw] {11110001-001111}
 name: DISP/RDS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 860 860 860 860 1803 860 860 860 860 1803 1803 860 860 1803 860 860 860 860 860 860 860 89527
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0F 00 00 00
 #
+# OSD [raw] {11010000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 860 860 860 860 860 860 1748 860 860 860 860 860 860 860 89555
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
-name: DISPLAY
+# DISPLAY [16 15 0] {110-10000--001111-000000}
+name: DISPLAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1803 832 832 832 832 832 832 4439 832 832 832 1803 832 832 832 832 832 832 1803 832 832 832 832 832 832 832 832 832 832 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: STEREO
+# STEREO [16 37 30] {110-10000--100101-011110}
+name: STEREO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 1803 1803 1803 832 832 832 832 832 832 5354 1803 832 832 1803 1803 1803 1803 1803 832 832 832 832 832 832 1803 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
-name: 6CH-DRT
+# 6CH-DRT [16 1 3] {110-10000--000001-000011}
+name: 6CH-DRT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 888 888 75461
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# DELAY [raw] {10110000-101000}
 name: DELAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1748 1748 860 860 1748 860 860 860 860 860 860 1748 1748 1748 1748 860 860 860 860 90443
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 68 00 00 00
 #
+# SURR-MODE [raw] {11010000-100101}
 name: SURR-MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 860 860 1748 1748 860 860 1748 1748 1748 860 89555
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
-name: MID-NIGHT
+# MID-NIGHT [16 37 42] {110-10000--100101-101010}
+name: MID-NIGHT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 832 832 1748 1748 1748 1748 1748 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 1778 76440
 #
-name: CENT-MODE
+# CENT-MODE [16 37 10] {110-10000--100101-001010}
+name: CENT-MODE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 1748 1748 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 1748 832 832 1748 1748 1748 1748 76294
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
-name: TEST-TONE
+# TEST-TONE [16 37 21] {110-10000--100101-010101}
+name: TEST-TONE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1720 832 832 832 832 832 832 5354 1720 832 832 1720 1720 1720 1720 1720 1720 1720 1720 1720 832 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: SUB+
+# SUB+ [16 37 39] {110-10000--100101-100111}
+name: SUB+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 860 860 1748 860 860 1748 860 860 860 860 860 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 889 889 889 889 889 75551
 #
-name: SUB-
+# SUB- [16 37 40] {110-10000--100101-101000}
+name: SUB- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 832 832 832 832 832 832 1748 832 832 832 832 832 832 5354 1748 832 832 1748 1748 1748 832 832 1748 1748 1748 832 832 832 832 76321
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 889 889 889 889 76440
 #
+# CENT+ [raw] {10010000-100110}
 name: CENT+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 860 860 1803 1803 860 860 860 860 860 860 1803 1803 860 860 1803 860 860 1803 90415
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 66 00 00 00
 #
+# CENT- [raw] {10110000-100111}
 name: CENT-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1748 1748 860 860 1748 860 860 860 860 860 860 1748 1748 860 860 1748 860 860 860 860 860 89555
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 67 00 00 00
 #
+# SURR+ [raw] {10010000-000001}
 name: SURR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 916 916 1803 1803 916 916 916 916 916 916 916 916 916 916 916 916 916 916 916 916 1803 916 89555
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 41 00 00 00
 #
+# SURR- [raw] {10110000-000010}
 name: SURR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1748 1748 916 916 1748 916 916 916 916 916 916 916 916 916 916 916 916 916 916 1748 1748 90415
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 42 00 00 00
 #
+# PRESET+ [raw] {11110001-100000}
 name: PRESET+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 860 860 860 860 1803 860 860 860 860 1803 860 860 1803 860 860 860 860 860 860 860 860 90443
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# PRESET- [raw] {11010001-100001}
 name: PRESET-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1803 1803 1803 860 860 860 860 1803 860 860 1803 860 860 860 860 860 860 1803 860 89555
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
+# TUNE+ [raw] {11110001-011110}
 name: TUNE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 860 860 860 860 1748 860 860 860 860 1748 1748 1748 860 860 860 860 860 860 1748 90359
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 1E 00 00 00
 #
+# TUNE- [raw] {11010001-011111}
 name: TUNE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 1748 1748 1748 860 860 860 860 1748 1748 1748 860 860 860 860 860 860 860 860 860 89527
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 1F 00 00 00
 #
+# FM-MODE [raw] {11110001-100101}
 name: FM-MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 860 860 860 860 860 860 1803 860 860 860 860 1803 860 860 1803 860 860 1803 1803 1803 860 89527
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 25 00 00 00
 #
+# PTY [raw] {10010001-111000}
 name: PTY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 860 860 1803 1803 860 860 860 860 1803 860 860 860 860 860 860 1803 860 860 860 860 90443
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 78 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR66.ir b/_Converted_/Pronto/M/Marantz/SR66.ir
index d60b263e..0251fb79 100644
--- a/_Converted_/Pronto/M/Marantz/SR66.ir
+++ b/_Converted_/Pronto/M/Marantz/SR66.ir
@@ -1,386 +1,450 @@
 Filetype: IR signals file
 Version: 1
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11110010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# ACR2 [raw] {11110111-111111}
 name: ACR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
-name: PRO_LOGIC
+# PRO_LOGIC [16 37 0] {110-10000--100101-000000}
+name: PRO_LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3-LOGIC
+# 3-LOGIC [16 37 24] {110-10000--100101-011000}
+name: 3-LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 860 860 1776 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 1778 889 889 889 889 76440
 #
-name: DELAY
+# DELAY [16 37 18] {110-10000--100101-010010}
+name: DELAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 1776 860 860 1776 1776 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 889 889 1778 1778 76440
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# DISPLAY [raw] {11110100-001011}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
-name: TEST
+# TEST [16 37 21] {110-10000--100101-010101}
+name: TEST (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: TUNE+
+# TUNE+ [16 37 34] {110-10000--100101-100010}
+name: TUNE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: TUNE-
+# TUNE- [16 37 35] {110-10000--100101-100011}
+name: TUNE- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 860 860 860 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
+# 1 [raw] {11100000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100000-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# CD_F_SRCH [raw] {11110100-100000}
 name: CD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# CD_R_SRCH [raw] {11110100-100001}
 name: CD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# CD_F_SCAN [raw] {11110100-110100}
 name: CD_F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# CD_R_SCAN [raw] {11110100-110010}
 name: CD_R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# CD_PLAY [raw] {11110100-110101}
 name: CD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# CD_STOP [raw] {11110100-110110}
 name: CD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# CD_PAUSE [raw] {11010100-110000}
 name: CD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# VCR1_PLAY [raw] {11100101-110101}
 name: VCR1_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR1_STOP [raw] {11100101-110110}
 name: VCR1_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR1_PAUSE [raw] {11100101-101001}
 name: VCR1_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR1_FFWD [raw] {11100101-100000}
 name: VCR1_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# VCR1_REW [raw] {11100101-100001}
 name: VCR1_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR1_F_SRCH [raw] {11100101-110100}
 name: VCR1_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR1_R_SRCH [raw] {11100101-110010}
 name: VCR1_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR1_REC [raw] {11100101-110111}
 name: VCR1_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# ACR_PLAY [raw] {11010010-110101}
 name: ACR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ACR_STOP [raw] {11010010-110110}
 name: ACR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# ACR_PAUSE [raw] {11010010-110000}
 name: ACR_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# ACR_FFWD [raw] {11010010-100000}
 name: ACR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# ACR_REW [raw] {11010010-100001}
 name: ACR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# ACR_REC [raw] {11010010-110111}
 name: ACR_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# POWER [raw] {11100000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0C 00 00 00
 #
+# MONO/ST [raw] {11100000-001010}
 name: MONO/ST
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0A 00 00 00
 #
+# MODE+ [raw] {11110000-101110}
 name: MODE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2E 00 00 00
 #
+# CENTR+ [raw] {10110000-100110}
 name: CENTR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 66 00 00 00
 #
+# CENTR- [raw] {10110000-100111}
 name: CENTR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 67 00 00 00
 #
+# SURR+ [raw] {10110000-000001}
 name: SURR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 41 00 00 00
 #
+# SURR- [raw] {10110000-000010}
 name: SURR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1803 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 42 00 00 00
 #
+# HALL [raw] {11110000-000011}
 name: HALL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 03 00 00 00
 #
+# DELAY [raw] {10110000-101000}
 name: DELAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 68 00 00 00
 #
+# INPUT_CYCLE [raw] {11110000-000000}
 name: INPUT_CYCLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 00 00 00 00
 #
+# TV_VOL+ [raw] {11100000-010000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 10 00 00 00
 #
+# TV_VOL- [raw] {11100000-010001}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
 #
-name: AUX1
+# AUX1 [16 0 6] {110-10000--000000-000110}
+name: AUX1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1803 1748 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
diff --git a/_Converted_/Pronto/M/Marantz/SR670.ir b/_Converted_/Pronto/M/Marantz/SR670.ir
index 6678c02c..bbfd11fd 100644
--- a/_Converted_/Pronto/M/Marantz/SR670.ir
+++ b/_Converted_/Pronto/M/Marantz/SR670.ir
@@ -1,386 +1,450 @@
 Filetype: IR signals file
 Version: 1
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11110010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# ACR2 [raw] {11110111-111111}
 name: ACR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
-name: PRO_LOGIC
+# PRO_LOGIC [16 37 0] {110-10000--100101-000000}
+name: PRO_LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3-LOGIC
+# 3-LOGIC [16 37 24] {110-10000--100101-011000}
+name: 3-LOGIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 860 860 1776 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 1778 889 889 889 889 76440
 #
-name: DELAY
+# DELAY [16 37 18] {110-10000--100101-010010}
+name: DELAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 1776 860 860 1776 1776 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 889 889 1778 1778 76440
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# DISPLAY [raw] {11110100-001011}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 0B 00 00 00
 #
-name: TEST
+# TEST [16 37 21] {110-10000--100101-010101}
+name: TEST (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 1776 1776 1776 1776 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: TUNE+
+# TUNE+ [16 37 34] {110-10000--100101-100010}
+name: TUNE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: TUNE-
+# TUNE- [16 37 35] {110-10000--100101-100011}
+name: TUNE- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 860 860 860 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
+# 1 [raw] {11100000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100000-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# CD_F_SRCH [raw] {11110100-100000}
 name: CD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# CD_R_SRCH [raw] {11110100-100001}
 name: CD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# CD_F_SCAN [raw] {11110100-110100}
 name: CD_F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# CD_R_SCAN [raw] {11110100-110010}
 name: CD_R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# CD_PLAY [raw] {11110100-110101}
 name: CD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# CD_STOP [raw] {11110100-110110}
 name: CD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# CD_PAUSE [raw] {11010100-110000}
 name: CD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# VCR1_PLAY [raw] {11100101-110101}
 name: VCR1_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR1_STOP [raw] {11100101-110110}
 name: VCR1_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR1_PAUSE [raw] {11100101-101001}
 name: VCR1_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR1_FFWD [raw] {11100101-100000}
 name: VCR1_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# VCR1_REW [raw] {11100101-100001}
 name: VCR1_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR1_F_SRCH [raw] {11100101-110100}
 name: VCR1_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR1_R_SRCH [raw] {11100101-110010}
 name: VCR1_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR1_REC [raw] {11100101-110111}
 name: VCR1_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# ACR_PLAY [raw] {11010010-110101}
 name: ACR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ACR_STOP [raw] {11010010-110110}
 name: ACR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# ACR_PAUSE [raw] {11010010-110000}
 name: ACR_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# ACR_FFWD [raw] {11010010-100000}
 name: ACR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# ACR_REW [raw] {11010010-100001}
 name: ACR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# ACR_REC [raw] {11010010-110111}
 name: ACR_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# POWER [raw] {11110000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
+# MONO/ST [raw] {11100000-001010}
 name: MONO/ST
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0A 00 00 00
 #
-name: MODE+
+# MODE+ [16 37 10] {110-10000--100101-001010}
+name: MODE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5354 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
+# CENTR+ [raw] {10110000-100110}
 name: CENTR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 66 00 00 00
 #
+# CENTR- [raw] {10110000-100111}
 name: CENTR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 67 00 00 00
 #
+# SURR+ [raw] {10110000-000001}
 name: SURR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 41 00 00 00
 #
+# SURR- [raw] {10110000-000010}
 name: SURR-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1803 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 42 00 00 00
 #
+# DSP [raw] {11110000-100101}
 name: DSP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
+# DELAY [raw] {10110000-101000}
 name: DELAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 68 00 00 00
 #
+# INPUT_CYCLE [raw] {10110000-000000}
 name: INPUT_CYCLE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 40 00 00 00
 #
+# TV_VOL+ [raw] {11100000-010000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 10 00 00 00
 #
+# TV_VOL- [raw] {11100000-010001}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
 #
-name: AUX1
+# AUX1 [16 0 6] {110-10000--000000-000110}
+name: AUX1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1803 1748 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
diff --git a/_Converted_/Pronto/M/Marantz/SR7005.ir b/_Converted_/Pronto/M/Marantz/SR7005.ir
index 24fb2b93..b7cf7886 100644
Binary files a/_Converted_/Pronto/M/Marantz/SR7005.ir and b/_Converted_/Pronto/M/Marantz/SR7005.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/SR7200.ir b/_Converted_/Pronto/M/Marantz/SR7200.ir
index 074eb2e0..3812fb1e 100644
--- a/_Converted_/Pronto/M/Marantz/SR7200.ir
+++ b/_Converted_/Pronto/M/Marantz/SR7200.ir
@@ -1,212 +1,247 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11010000-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
-name: A/D
+# A/D [16 1 1] {110-10000--000001-000001}
+name: A/D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: ATT
+# ATT [16 37 43] {110-10000--100101-101011}
+name: ATT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 1803 1803 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 889 889 889 75551
 #
-name: NIGHT
+# NIGHT [16 37 42] {110-10000--100101-101010}
+name: NIGHT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 1803 1803 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 1778 76440
 #
-name: MR-ON
+# MR-ON [16 29 3] {110-10000--011101-000011}
+name: MR-ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 1803 888 888 888 888 1803 1803 1803 888 888 888 888 888 888 1803 888 888 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
-name: MR-OFF
+# MR-OFF [16 29 4] {110-10000--011101-000100}
+name: MR-OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 4439 888 1803 888 888 888 888 1803 1803 1803 888 888 888 888 1803 1803 888 888 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 1778 1778 889 889 76440
 #
-name: 7-DIR
+# 7-DIR [16 1 3] {110-10000--000001-000011}
+name: 7-DIR (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 888 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# TREBLE+ [raw] {11110000-011000}
 name: TREBLE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 888 888 90470
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 18 00 00 00
 #
+# TREBLE- [raw] {11010000-011001}
 name: TREBLE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 888 888 1803 888 888 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 19 00 00 00
 #
+# BASS+ [raw] {11110000-010110}
 name: BASS+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 1803 90443
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 16 00 00 00
 #
+# BASS- [raw] {11010000-010111}
 name: BASS-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 17 00 00 00
 #
+# CH+ [raw] {11100000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11000000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 89610
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# UP [raw] {10110000-010000}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 1803 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 50 00 00 00
 #
+# LEFT [raw] {10010000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 1803 1803 1803 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# OK [raw] {10110000-010010}
 name: OK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 1803 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 1803 1803 90443
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# RIGHT [raw] {10010000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 888 888 1803 1803 888 888 888 888 888 888 888 888 1803 1803 1803 888 888 1803 90443
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# DOWN [raw] {10110000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1803 1803 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 1803 888 89582
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# CLEAR [raw] {11010001-111010}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 1803 90415
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3A 00 00 00
 #
+# MEMO [raw] {11110001-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 1803 1803 1803 888 888 1803 888 89582
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 29 00 00 00
 #
+# MUTE [raw] {11010000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 1803 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
-name: 1
+# 1 [16 37 45] {110-10000--100101-101101}
+name: 1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 888 888 1803 1803 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 889 75551
 #
-name: 2
+# 2 [16 37 0] {110-10000--100101-000000}
+name: 2 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: 3
+# 3 [16 37 46] {110-10000--100101-101110}
+name: 3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 1803 1803 888 888 888 888 1803 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 889 889 1778 76440
 #
-name: 4
+# 4 [16 37 62] {110-10000--100101-111110}
+name: 4 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 1803 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 1778 76440
 #
-name: 5
+# 5 [16 37 61] {110-10000--100101-111101}
+name: 5 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 1803 1803 888 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 1778 1778 889 75551
 #
-name: 6
+# 6 [16 37 63] {110-10000--100101-111111}
+name: 6 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 75551
 #
-name: 7
+# 7 [16 37 57] {110-10000--100101-111001}
+name: 7 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 888 888 888 888 888 888 1803 888 888 1803 888 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 889 889 1778 889 889 1778 889 75551
 #
-name: 8
+# 8 [16 37 30] {110-10000--100101-011110}
+name: 8 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 5354 1803 888 888 1803 1803 1803 1803 1803 888 888 888 888 888 888 1803 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
+# 9 [raw] {11110000-001111}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
+# 0 [raw] {11010000-100110}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1803 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90443
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR880MKII_-_MULTICODE.ir b/_Converted_/Pronto/M/Marantz/SR880MKII_-_MULTICODE.ir
index 89b39a86..2088d712 100644
--- a/_Converted_/Pronto/M/Marantz/SR880MKII_-_MULTICODE.ir
+++ b/_Converted_/Pronto/M/Marantz/SR880MKII_-_MULTICODE.ir
@@ -1,95 +1,110 @@
 Filetype: IR signals file
 Version: 1
 #
+# SOURCE_ON/OFF [raw] {11110000-001100}
 name: SOURCE_ON/OFF
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
-name: POWER_ON
+# POWER_ON [16 12 1] {110-10000--001100-000001}
+name: POWER_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: POWER_OFF
+# POWER_OFF [16 12 2] {110-10000--001100-000010}
+name: POWER_OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# DSS/VCR2 [raw] {11000110-111111}
 name: DSS/VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
-name: DVD
+# DVD [16 0 10] {110-10000--000000-001010}
+name: DVD (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 1778 76440
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11110010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# CDR [raw] {11011010-111111}
 name: CDR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 1A 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TUNER [raw] {11010001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
 name: UP
 type: raw
@@ -97,266 +112,310 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 90553 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 125094
 #
+# DOWN [raw] {10110000-010001}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 51 00 00 00
 #
+# LEFT [raw] {10010000-010101}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 55 00 00 00
 #
+# RIGHT [raw] {10110000-010110}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 56 00 00 00
 #
+# OK [raw] {10010000-010010}
 name: OK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 52 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# PLAY [raw] {11000100-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 04 00 00 00
+command: 35 00 00 00
 #
+# STOP [raw] {11100100-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 04 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11000100-110000}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 04 00 00 00
+command: 30 00 00 00
 #
+# TRACK_- [raw] {11111010-100001}
 name: TRACK_-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 1A 00 00 00
+command: 21 00 00 00
 #
+# TRACK_+ [raw] {11011010-100000}
 name: TRACK_+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 1A 00 00 00
+command: 20 00 00 00
 #
+# REV [raw] {11110000-101100}
 name: REV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2C 00 00 00
 #
+# FWD [raw] {11010000-101011}
 name: FWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2B 00 00 00
 #
-name: AMP_AUTO
+# AMP_AUTO [16 37 45] {110-10000--100101-101101}
+name: AMP_AUTO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 1778 889 75551
 #
-name: AMP_HALL
+# AMP_HALL [16 37 1] {110-10000--100101-000001}
+name: AMP_HALL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: AMP_DOLB
+# AMP_DOLB [16 37 0] {110-10000--100101-000000}
+name: AMP_DOLB (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
-name: AMP_MTRX
+# AMP_MTRX [16 37 9] {110-10000--100101-001001}
+name: AMP_MTRX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 889 889 1778 889 75551
 #
-name: AMP_MOV
+# AMP_MOV [16 37 29] {110-10000--100101-011101}
+name: AMP_MOV (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 1778 1778 889 75551
 #
-name: AMP_THX
+# AMP_THX [16 37 36] {110-10000--100101-100100}
+name: AMP_THX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 889 889 76440
 #
-name: AMP_DTS
+# AMP_DTS [16 37 46] {110-10000--100101-101110}
+name: AMP_DTS (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 889 889 1778 76440
 #
-name: AMP_2-CH
+# AMP_2-CH [16 37 30] {110-10000--100101-011110}
+name: AMP_2-CH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 888 888 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 889 889 889 889 889 889 1778 76440
 #
-name: AMP_A/D
+# AMP_A/D [16 1 1] {110-10000--000001-000001}
+name: AMP_A/D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: AMP_MONO
+# AMP_MONO [16 37 37] {110-10000--100101-100101}
+name: AMP_MONO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 1778 1778 889 75551
 #
-name: AMP_3D
+# AMP_3D [16 37 48] {110-10000--100101-110000}
+name: AMP_3D (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 889 889 1778 889 889 889 889 889 889 76440
 #
-name: AMP_NITE
+# AMP_NITE [16 37 42] {110-10000--100101-101010}
+name: AMP_NITE (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 1778 76440
 #
-name: AMP_MLTI
+# AMP_MLTI [16 29 0] {110-10000--011101-000000}
+name: AMP_MLTI (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 1778 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# AMP_OSD [raw] {11010000-001111}
 name: AMP_OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0F 00 00 00
 #
-name: AMP_ATT
+# AMP_ATT [16 37 43] {110-10000--100101-101011}
+name: AMP_ATT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 1778 889 889 889 75551
 #
+# AMP_DIR [raw] {11010000-100010}
 name: AMP_DIR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 22 00 00 00
 #
+# AMP_TRB+ [raw] {11110000-011000}
 name: AMP_TRB+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 18 00 00 00
 #
+# AMP_TRB- [raw] {11010000-011001}
 name: AMP_TRB-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 19 00 00 00
 #
+# AMP_BAS+ [raw] {11110000-010110}
 name: AMP_BAS+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 16 00 00 00
 #
+# AMP_BAS- [raw] {11010000-010111}
 name: AMP_BAS-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 17 00 00 00
 #
-name: AMP_R-EQ
+# AMP_R-EQ [16 37 44] {110-10000--100101-101100}
+name: AMP_R-EQ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 889 889 1778 889 889 76440
 #
-name: AMP_CH+
+# AMP_CH+ [16 37 33] {110-10000--100101-100001}
+name: AMP_CH+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 889 889 1778 889 75551
 #
-name: AMP_LVL+
+# AMP_LVL+ [16 37 34] {110-10000--100101-100010}
+name: AMP_LVL+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: AMP_LVL-
+# AMP_LVL- [16 37 35] {110-10000--100101-100011}
+name: AMP_LVL- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
-name: AMP_VOL+
+# AMP_VOL+ [16 37 39] {110-10000--100101-100111}
+name: AMP_VOL+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 1778 889 889 889 889 889 75551
 #
-name: AMP_VOL-
+# AMP_VOL- [16 37 40] {110-10000--100101-101000}
+name: AMP_VOL- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 5327 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 1778 1778 889 889 889 889 76440
 #
-name: AMP_6-CH
+# AMP_6-CH [16 1 3] {110-10000--000001-000011}
+name: AMP_6-CH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
-name: AMP_BYP
+# AMP_BYP [16 1 1] {110-10000--000001-000001}
+name: AMP_BYP (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4439 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# AMP_SLEP [raw] {11110000-100110}
 name: AMP_SLEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
-name: AMP_DISP
+# AMP_DISP [16 15 0] {110-10000--001111-000000}
+name: AMP_DISP (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
+# AMP_MODE [raw] {11110000-100101}
 name: AMP_MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
+# AMP_PHNO [raw] {11010101-111111}
 name: AMP_PHNO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR92MK2_SURROUND_SOUND_PROCESSOR.ir b/_Converted_/Pronto/M/Marantz/SR92MK2_SURROUND_SOUND_PROCESSOR.ir
index 3088b860..7b87efbc 100644
--- a/_Converted_/Pronto/M/Marantz/SR92MK2_SURROUND_SOUND_PROCESSOR.ir
+++ b/_Converted_/Pronto/M/Marantz/SR92MK2_SURROUND_SOUND_PROCESSOR.ir
@@ -1,179 +1,208 @@
 Filetype: IR signals file
 Version: 1
 #
+# AM/FM [raw] {11110001-111111}
 name: AM/FM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# PHONO [raw] {11110101-111111}
 name: PHONO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR [raw] {11110010-111111}
 name: ACR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11100101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11100110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# 1 [raw] {11110001-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11110001-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 1803 90581
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110001-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 888 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11110001-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 1803 1803 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110001-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11110001-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 1803 888 888 1803 90581
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110001-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 1803 888 888 888 888 888 89721
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110001-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 1803 1803 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110001-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11110001-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 00 00 00 00
 #
+# TUNE+ [raw] {11110001-100000}
 name: TUNE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 90637
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# TUNE- [raw] {11110001-100001}
 name: TUNE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 89749
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
-name: DELAY
+# DELAY [16 37 17] {110-10000--100101-010001}
+name: DELAY (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 1776 1776 860 860 860 860 1776 860 75600
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 889 889 889 889 1778 889 75551
 #
-name: VOL-S+
+# VOL-S+ [16 37 14] {110-10000--100101-001110}
+name: VOL-S+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 860 860 860 860 1776 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 889 889 889 889 1778 76440
 #
-name: VOL-S-
+# VOL-S- [16 37 15] {110-10000--100101-001111}
+name: VOL-S- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 860 860 860 860 860 860 860 75600
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 889 889 889 889 889 889 889 75551
 #
+# SURR-MODE [raw] {11110000-100101}
 name: SURR-MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 25 00 00 00
 #
-name: VOL-C+
+# VOL-C+ [16 37 11] {110-10000--100101-001011}
+name: VOL-C+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 1776 1776 860 860 860 75600
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 1778 889 889 889 75551
 #
-name: VOL-C-
+# VOL-C- [16 37 12] {110-10000--100101-001100}
+name: VOL-C- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 860 860 1776 860 860 76488
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 889 889 1778 889 889 76440
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89749
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
-name: CENTER
+# CENTER [16 37 10] {110-10000--100101-001010}
+name: CENTER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 1776 860 860 1776 1776 1776 1776 76460
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 889 889 1778 1778 1778 1778 76440
 #
 name: STBY
 type: raw
diff --git a/_Converted_/Pronto/M/Marantz/SR96.ir b/_Converted_/Pronto/M/Marantz/SR96.ir
index d28edc3a..e6d8e0c9 100644
--- a/_Converted_/Pronto/M/Marantz/SR96.ir
+++ b/_Converted_/Pronto/M/Marantz/SR96.ir
@@ -1,113 +1,131 @@
 Filetype: IR signals file
 Version: 1
 #
-name: SOURCE_ON
+# SOURCE_ON [16 12 0] {110-10000--001100-000000}
+name: SOURCE_ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4467 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 76349
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 76440
 #
+# POWER_ON [raw] {11110000-001100}
 name: POWER_ON
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90581
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0C 00 00 00
 #
+# SLEEP [raw] {11110000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 1803 1803 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# TV [raw] {11100000-111111}
 name: TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11101100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
-name: VCR1
+# VCR1 [16 0 5] {110-10000--000000-000101}
+name: VCR1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4467 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 75461
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 75551
 #
-name: AUX
+# AUX [16 0 6] {110-10000--000000-000110}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 860 1803 860 860 1803 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 1778 76440
 #
+# TUNER [raw] {11110001-111111}
 name: TUNER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11110100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# ACR1 [raw] {11110010-111111}
 name: ACR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# ACR2 [raw] {11110111-111111}
 name: ACR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3F 00 00 00
 #
+# MUTE [raw] {11110000-001101}
 name: MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 0D 00 00 00
 #
+# VOL+ [raw] {11110000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11110000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
 #
+# TV_MUTE [raw] {11100000-001101}
 name: TV_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
 #
+# TV_VOL+ [raw] {11100000-010000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 10 00 00 00
 #
+# TV_VOL- [raw] {11100000-010001}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
 #
-name: DISP
+# DISP [16 15 0] {110-10000--001111-000000}
+name: DISP (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 860 860 860 860 1803 860 860 860 860 860 860 4439 860 860 860 1803 860 860 860 860 860 860 1803 860 860 860 860 860 860 860 860 860 860 76432
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 76440
 #
 name: CH_SEL
 type: raw
@@ -115,260 +133,303 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 75517 860 860 860 860 860 860 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 87141 860 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 860 860 1776 860 511305
 #
-name: TEST
+# TEST [16 37 21] {110-10000--100101-010101}
+name: TEST (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1748 1748 1748 860 860 860 860 860 860 5354 1748 860 860 1748 1748 1748 1748 1748 1748 1748 1748 1748 860 75544
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 1778 1778 1778 1778 1778 1778 889 75551
 #
-name: TUNE+
+# TUNE+ [16 37 34] {110-10000--100101-100010}
+name: TUNE+ (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 1776 76377
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 1778 76440
 #
-name: TUNE-
+# TUNE- [16 37 35] {110-10000--100101-100011}
+name: TUNE- (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 860 1776 1776 1776 860 860 860 860 860 860 5354 1776 860 860 1776 1776 1776 860 860 1776 860 860 860 860 1776 860 860 860 75517
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 5334 1778 889 889 1778 1778 1778 889 889 1778 889 889 889 889 1778 889 889 889 75551
 #
+# 1 [raw] {11100000-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100000-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100000-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100000-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100000-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100000-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 1803 90498
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100000-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1803 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100000-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100000-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 888 89666
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100000-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 00 00 00 00
 #
+# CD_F_SRCH [raw] {11010100-100000}
 name: CD_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 20 00 00 00
 #
+# CD_R_SRCH [raw] {11010100-100001}
 name: CD_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 21 00 00 00
 #
+# CD_F_SCAN [raw] {11010100-110100}
 name: CD_F_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 34 00 00 00
 #
+# CD_R_SCAN [raw] {11010100-110010}
 name: CD_R_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 1776 90498
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 32 00 00 00
 #
+# CD_PLAY [raw] {11010100-110101}
 name: CD_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 35 00 00 00
 #
+# CD_STOP [raw] {11010100-110110}
 name: CD_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 36 00 00 00
 #
+# CD_PAUSE [raw] {11010100-110000}
 name: CD_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 30 00 00 00
 #
+# VCR1_PLAY [raw] {11100101-110101}
 name: VCR1_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# VCR1_STOP [raw] {11100101-110110}
 name: VCR1_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# VCR1_PAUSE [raw] {11100101-101001}
 name: VCR1_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# VCR1_FFWD [raw] {11100101-100000}
 name: VCR1_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# VCR1_REW [raw] {11100101-100001}
 name: VCR1_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR1_F_SRCH [raw] {11100101-110100}
 name: VCR1_F_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# VCR1_R_SRCH [raw] {11100101-110010}
 name: VCR1_R_SRCH
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90470
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# VCR1_REC [raw] {11100101-011101}
 name: VCR1_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89693
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# ACR_PLAY [raw] {11010010-110101}
 name: ACR_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# ACR_STOP [raw] {11010010-110110}
 name: ACR_STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 90498
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# ACR_PAUSE [raw] {11100101-101001}
 name: ACR_PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# ACR_FFWD [raw] {11010010-100000}
 name: ACR_FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 90553
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# ACR_REW [raw] {11010010-100001}
 name: ACR_REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# ACR_REC [raw] {11110010-110111}
 name: ACR_REC
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
-name: LD
+# LD [16 0 7] {110-10000--000000-000111}
+name: LD (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 888 888 4467 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 75489
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 889 889 4445 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 75551
 #
+# AFP [raw] {10101100-110011}
 name: AFP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1803 1776 1803 888 888 1776 888 888 1776 888 888 1776 888 888 1776 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 73 00 00 00
 #
+# B-- [raw] {10101100-110010}
 name: B--
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1803 1776 1803 888 888 1776 888 888 1776 888 888 1776 888 888 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 72 00 00 00
 #
+# CH+ [raw] {11100000-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 90581
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100000-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
+# MODE+ [raw] {11100000-100011}
 name: MODE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 888 89693
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 23 00 00 00
 #
+# MEMO [raw] {11100000-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 89693
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 29 00 00 00
 #
+# TEXT [raw] {11100000-111100}
 name: TEXT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 888 888 90581
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3C 00 00 00
 #
+# TIME [raw] {11100000-101010}
 name: TIME
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 1776 90553
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2A 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/SR_Series.ir b/_Converted_/Pronto/M/Marantz/SR_Series.ir
index e2696229..224d06e2 100644
--- a/_Converted_/Pronto/M/Marantz/SR_Series.ir
+++ b/_Converted_/Pronto/M/Marantz/SR_Series.ir
@@ -727,14 +727,16 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 444 444 444 444 444 444 888 444 444 888 444 444 444 83313 2663 888 444 888 444 444 444 444 444 888 888 444 444 444 444 444 444 444 444 444 888 888 444 444 444 444
 #
-name: TUNER-OFF
+# TUNER-OFF [17 12 2] {110-10001--001100-000010}
+name: TUNER-OFF (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 3551 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 76321
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 1778 889 3556 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
-name: TUNER-ON
+# TUNER-ON [17 12 1] {110-10001--001100-000001}
+name: TUNER-ON (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 3551 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75433
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 1778 1778 889 889 889 889 1778 889 3556 889 889 889 1778 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
diff --git a/_Converted_/Pronto/M/Marantz/SR_Series_1.ir b/_Converted_/Pronto/M/Marantz/SR_Series_1.ir
index 24fb2b93..b7cf7886 100644
Binary files a/_Converted_/Pronto/M/Marantz/SR_Series_1.ir and b/_Converted_/Pronto/M/Marantz/SR_Series_1.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/ST-6000.ir b/_Converted_/Pronto/M/Marantz/ST-6000.ir
index a8fdfdf4..d150aa93 100644
--- a/_Converted_/Pronto/M/Marantz/ST-6000.ir
+++ b/_Converted_/Pronto/M/Marantz/ST-6000.ir
@@ -1,107 +1,124 @@
 Filetype: IR signals file
 Version: 1
 #
+# SLEEP [raw] {11010000-100110}
 name: SLEEP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 26 00 00 00
 #
+# POWER [raw] {11110001-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 888 888 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0C 00 00 00
 #
+# BAND [raw] {11010001-111111}
 name: BAND
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89666
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# DISPLAY [raw] {11110001-001111}
 name: DISPLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 888 888 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0F 00 00 00
 #
+# F_DIRECT [raw] {11010001-001011}
 name: F_DIRECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 0B 00 00 00
 #
+# 1 [raw] {11110001-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010001-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 1776 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11110001-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010001-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11110001-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010001-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 1776 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11110001-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11110001-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11110001-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 09 00 00 00
 #
+# FM_MODE [raw] {11010001-100101}
 name: FM_MODE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 1776 1776 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 25 00 00 00
 #
+# 0 [raw] {11010001-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 00 00 00 00
 #
+# IF_BAND [raw] {11110001-101000}
 name: IF_BAND
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 28 00 00 00
 #
 name: TUNE-
 type: raw
@@ -109,32 +126,37 @@ frequency: 36045
 duty_cycle: 0.330000
 data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 89666 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 262644
 #
+# TUNE+ [raw] {11110001-011110}
 name: TUNE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 90553
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 1E 00 00 00
 #
+# PRESET- [raw] {11010001-100001}
 name: PRESET-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
+# MEMO [raw] {11110001-101001}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 29 00 00 00
 #
+# PRESET+ [raw] {11010001-100000}
 name: PRESET+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 888 888 90526
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# P_SCAN [raw] {11110001-101011}
 name: P_SCAN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 89638
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 2B 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/STEREO_CASS_DECK_PMD500.ir b/_Converted_/Pronto/M/Marantz/STEREO_CASS_DECK_PMD500.ir
index b2a6bc81..22b1df4e 100644
--- a/_Converted_/Pronto/M/Marantz/STEREO_CASS_DECK_PMD500.ir
+++ b/_Converted_/Pronto/M/Marantz/STEREO_CASS_DECK_PMD500.ir
@@ -1,182 +1,212 @@
 Filetype: IR signals file
 Version: 1
 #
+# REVERSE [raw] {11110010-101111}
 name: REVERSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 840 840 840 840 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# FORWARD [raw] {11010010-101111}
 name: FORWARD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 840 840 840 840 840 840 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2F 00 00 00
 #
+# DECK_A [raw] {11010010-101100}
 name: DECK_A
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 1819 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2C 00 00 00
 #
+# DECK_B [raw] {11010010-101110}
 name: DECK_B
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 896 896 896 896 1819 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2E 00 00 00
 #
+# 1 [raw] {11010010-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 1791 896 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010010-000010}
 name: 2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010010-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 868 868 1791 868 868 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010010-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 1791 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010010-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 1791 1791 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010010-000110}
 name: 6
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 1791 896 896 1791 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010010-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 868 868 1791 868 868 868 868 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010010-001000}
 name: 8
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 1791 1791 896 896 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010010-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 1791 868 868 1791 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010010-000000}
 name: 0
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 00 00 00 00
 #
+# CONT [raw] {11010010-100100}
 name: CONT
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 24 00 00 00
 #
+# MODE [raw] {11010010-011101}
 name: MODE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 1791 868 868 868 868 1791 1791 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 1D 00 00 00
 #
+# VOL+ [raw] {11010010-010000}
 name: VOL+
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010010-010001}
 name: VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 1791 896 896 896 896 1791 896 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 11 00 00 00
 #
+# AMS [raw] {11010010-101011}
 name: AMS
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 1819 840 840 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2B 00 00 00
 #
+# MEMO [raw] {11010010-101001}
 name: MEMO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1819 1819 1819 840 840 1819 1819 1819 1819 1819 1819 840 840 1819 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 29 00 00 00
 #
+# RED [raw] {11010010-101010}
 name: RED
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1819 1819 1819 896 896 1819 1819 1819 1819 1819 1819 1819 1819 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 2A 00 00 00
 #
+# COUNTER [raw] {11010010-001111}
 name: COUNTER
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 868 1791 1791 1791 868 868 1791 1791 868 868 868 868 1791 868 868 868 868 868 868 868 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 0F 00 00 00
 #
+# F_SCAN [raw] {11010010-100000}
 name: F_SCAN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 20 00 00 00
 #
+# R_SCAN [raw] {11010010-100001}
 name: R_SCAN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 21 00 00 00
 #
+# PLAY [raw] {11010010-110101}
 name: PLAY
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 1791 1791 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 35 00 00 00
 #
+# PAUSE [raw] {11010010-110000}
 name: PAUSE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 30 00 00 00
 #
+# STOP [raw] {11010010-110110}
 name: STOP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 896 896 1791 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 36 00 00 00
 #
+# RECORD [raw] {11010010-110111}
 name: RECORD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 840 1791 1791 1791 840 840 1791 1791 1791 840 840 1791 1791 840 840 840 840 840 89690
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 37 00 00 00
 #
+# FFWD [raw] {11010010-110100}
 name: FFWD
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 34 00 00 00
 #
+# REW [raw] {11010010-110010}
 name: REW
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 896 896 1791 1791 1791 896 896 1791 896 896 1791 1791 90502
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 32 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/ST_53.ir b/_Converted_/Pronto/M/Marantz/ST_53.ir
index bb37b69a..ffbb5823 100644
--- a/_Converted_/Pronto/M/Marantz/ST_53.ir
+++ b/_Converted_/Pronto/M/Marantz/ST_53.ir
@@ -1,134 +1,156 @@
 Filetype: IR signals file
 Version: 1
 #
+# TUNE- [raw] {11010001-100001}
 name: TUNE-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1748 1776 888 888 888 888 1776 888 888 1776 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 21 00 00 00
 #
+# TUNE+ [raw] {11010001-100000}
 name: TUNE+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 20 00 00 00
 #
+# 1 [raw] {11010001-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1748 1776 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11010001-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 1803 90470
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11010001-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 1803 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11010001-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 1803 1803 888 888 90498
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11010001-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 1776 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11010001-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 1803 888 888 1803 90443
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11010001-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 1803 888 888 888 888 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11010001-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 1803 1803 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11010001-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1748 1776 888 888 888 888 1776 1776 888 888 1776 1776 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11010001-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 1803 888 888 888 888 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 00 00 00 00
 #
+# MEMO [raw] {11010000-101101}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 2D 00 00 00
 #
+# FM/AM [raw] {11010001-111111}
 name: FM/AM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 11 00 00 00
+command: 3F 00 00 00
 #
+# PHONO [raw] {11010101-111111}
 name: PHONO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 15 00 00 00
+command: 3F 00 00 00
 #
+# CD [raw] {11010100-111111}
 name: CD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 14 00 00 00
+command: 3F 00 00 00
 #
+# TAPE [raw] {11010010-111111}
 name: TAPE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 12 00 00 00
+command: 3F 00 00 00
 #
+# LD [raw] {11001100-111111}
 name: LD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 888 888 1803 888 888 1803 888 888 1803 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 0C 00 00 00
+command: 3F 00 00 00
 #
+# VCR1 [raw] {11000101-111111}
 name: VCR1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3F 00 00 00
 #
+# VCR2 [raw] {11000110-111111}
 name: VCR2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 860 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 888 888 888 888 888 888 89582
+type: parsed
+protocol: RC5
+address: 06 00 00 00
+command: 3F 00 00 00
 #
+# VOL+ [raw] {11010000-010000}
 name: VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1803 1748 1803 888 888 888 888 888 888 888 888 1803 1803 888 888 888 888 888 888 90498
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 10 00 00 00
 #
+# VOL- [raw] {11010000-010001}
 name: VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1748 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 89610
+type: parsed
+protocol: RC5
+address: 10 00 00 00
+command: 11 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/TV-VCR.ir b/_Converted_/Pronto/M/Marantz/TV-VCR.ir
index 7e7a1b69..adf5f90c 100644
--- a/_Converted_/Pronto/M/Marantz/TV-VCR.ir
+++ b/_Converted_/Pronto/M/Marantz/TV-VCR.ir
@@ -1,122 +1,142 @@
 Filetype: IR signals file
 Version: 1
 #
+# POWER [raw] {11110111-000110}
 name: POWER
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 896 896 896 896 1791 896 896 896 896 1791 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 06 00 00 00
 #
+# VOL+ [raw] {11010111-110000}
 name: VOL+
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 1791 896 896 896 896 896 896 90446
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# VOL- [raw] {11010111-111110}
 name: VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3E 00 00 00
 #
+# MUTE [raw] {11010111-100000}
 name: MUTE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 896 896 896 896 896 896 896 90446
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 20 00 00 00
 #
+# 1 [raw] {11000101-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 896 896 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100101-000010}
 name: 2
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 1791 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100101-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 896 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100101-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 896 896 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100101-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 1791 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100101-000110}
 name: 6
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100101-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100101-001000}
 name: 8
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 896 896 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100101-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 896 896 1791 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100101-000000}
 name: 0
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# 100 [raw] {11100101-001010}
 name: 100
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 1791 896 896 1791 1791 1791 1791 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0A 00 00 00
 #
+# CH+ [raw] {11010111-110011}
 name: CH+
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 896 896 1791 896 896 1791 896 896 896 89579
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 33 00 00 00
 #
+# CH- [raw] {11110111-110110}
 name: CH-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 1791 1791 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# AUDIO [raw] {11100101-100011}
 name: AUDIO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 896 896 1791 896 896 896 896 1791 896 896 896 89579
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# PIC_CONTROL [raw] {10100101-000110}
 name: PIC_CONTROL
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 46 00 00 00
 #
+# VCR/TV [raw] {11100101-111110}
 name: VCR/TV
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 1791 1791 1791 896 896 896 896 896 896 896 896 896 896 1791 90446
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/UD5005.ir b/_Converted_/Pronto/M/Marantz/UD5005.ir
index 02dc7d6f..e5c75b2b 100644
Binary files a/_Converted_/Pronto/M/Marantz/UD5005.ir and b/_Converted_/Pronto/M/Marantz/UD5005.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/UD5007.ir b/_Converted_/Pronto/M/Marantz/UD5007.ir
index 58cba63c..81a1bf4b 100644
Binary files a/_Converted_/Pronto/M/Marantz/UD5007.ir and b/_Converted_/Pronto/M/Marantz/UD5007.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/UD7006.ir b/_Converted_/Pronto/M/Marantz/UD7006.ir
index 37648621..d4325a8c 100644
Binary files a/_Converted_/Pronto/M/Marantz/UD7006.ir and b/_Converted_/Pronto/M/Marantz/UD7006.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/UD9004.ir b/_Converted_/Pronto/M/Marantz/UD9004.ir
index 37648621..d4325a8c 100644
Binary files a/_Converted_/Pronto/M/Marantz/UD9004.ir and b/_Converted_/Pronto/M/Marantz/UD9004.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/UD_Series.ir b/_Converted_/Pronto/M/Marantz/UD_Series.ir
index aaaf88b2..5eba4720 100644
Binary files a/_Converted_/Pronto/M/Marantz/UD_Series.ir and b/_Converted_/Pronto/M/Marantz/UD_Series.ir differ
diff --git a/_Converted_/Pronto/M/Marantz/VCR_MV-610_(EVEN).ir b/_Converted_/Pronto/M/Marantz/VCR_MV-610_(EVEN).ir
index b210ca15..9b58d8b0 100644
--- a/_Converted_/Pronto/M/Marantz/VCR_MV-610_(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/VCR_MV-610_(EVEN).ir
@@ -1,278 +1,324 @@
 Filetype: IR signals file
 Version: 1
 #
+# TV_POWER [raw] {11010111-000110}
 name: TV_POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 06 00 00 00
 #
+# POWER [raw] {11000101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# TV_MUTE [raw] {11110111-100000}
 name: TV_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 20 00 00 00
 #
+# TV_VOL+ [raw] {11110111-110000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# TV_VOL- [raw] {11110111-111110}
 name: TV_VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 90166
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3E 00 00 00
 #
+# EJECT [raw] {11100101-101101}
 name: EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 2D 00 00 00
 #
+# TV_CH+ [raw] {11110111-110011}
 name: TV_CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 33 00 00 00
 #
+# TV_CH- [raw] {11010111-110110}
 name: TV_CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# PLAY [raw] {11000101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# REW [raw] {11000101-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11000101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11000101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11000101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# SKIP [raw] {10100101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
+# 1 [raw] {11000101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11000101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11000101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11000101-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 896 896 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 896 896 90166
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11000101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11000101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11000101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11000101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11000101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11000101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# 100 [raw] {11000101-001010}
 name: 100
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0A 00 00 00
 #
+# CH+ [raw] {11000101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11000101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR_PLUS [raw] {10000101-000101}
 name: VCR_PLUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 45 00 00 00
 #
+# MENU [raw] {11000101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# CLEAR [raw] {11000101-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# STATUS [raw] {11100101-001111}
 name: STATUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# PLAY_SPEED_UP [raw] {11100101-100110}
 name: PLAY_SPEED_UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 26 00 00 00
 #
+# PLAY_SPEED_DN [raw] {11100101-100101}
 name: PLAY_SPEED_DN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 25 00 00 00
 #
+# RECORD [raw] {11100101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# OTR [raw] {11100101-100111}
 name: OTR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 27 00 00 00
 #
+# TRACKING+ [raw] {10100101-001101}
 name: TRACKING+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4D 00 00 00
 #
+# TRACKING- [raw] {10000101-001110}
 name: TRACKING-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4E 00 00 00
 #
+# MEMO [raw] {11000101-111011}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
+# SP/SLP [raw] {11000101-111010}
 name: SP/SLP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# AUDIO [raw] {11000101-100011}
 name: AUDIO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# PICT_CONTROL [raw] {10000101-000110}
 name: PICT_CONTROL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 46 00 00 00
 #
+# VCR/TV [raw] {11000101-111110}
 name: VCR/TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# CLK_CNT [raw] {11000101-111100}
 name: CLK_CNT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3C 00 00 00
 #
+# VESS_<< [raw] {10000101-110001}
 name: VESS_<<
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 71 00 00 00
 #
+# VESS_>> [raw] {10000101-110000}
 name: VESS_>>
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 70 00 00 00
 #
+# VARIABLE_PLAY [raw] {11000101-101000}
 name: VARIABLE_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 28 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/VCR_MV-610_(ODD).ir b/_Converted_/Pronto/M/Marantz/VCR_MV-610_(ODD).ir
index 7462a4f1..e0392d12 100644
--- a/_Converted_/Pronto/M/Marantz/VCR_MV-610_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/VCR_MV-610_(ODD).ir
@@ -1,278 +1,324 @@
 Filetype: IR signals file
 Version: 1
 #
+# TV_POWER [raw] {11110111-000110}
 name: TV_POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 06 00 00 00
 #
+# POWER [raw] {11100101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# TV_MUTE [raw] {11010111-100000}
 name: TV_MUTE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 896 896 896 896 896 896 896 90166
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 20 00 00 00
 #
+# TV_VOL+ [raw] {11010111-110000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# TV_VOL- [raw] {11010111-111110}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3E 00 00 00
 #
+# EJECT [raw] {11000101-101101}
 name: EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 2D 00 00 00
 #
+# TV_CH+ [raw] {11010111-110011}
 name: TV_CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 33 00 00 00
 #
+# TV_CH- [raw] {11110111-110110}
 name: TV_CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# PLAY [raw] {11100101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# REW [raw] {11100101-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11100101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11100101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# SKIP [raw] {10000101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
+# 1 [raw] {11100101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100101-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# 100 [raw] {11100101-001010}
 name: 100
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0A 00 00 00
 #
+# CH+ [raw] {11100101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR_PLUS [raw] {10100101-000101}
 name: VCR_PLUS
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 1791 896 89299
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 45 00 00 00
 #
+# MENU [raw] {11100101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# CLEAR [raw] {11100101-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# STATUS [raw] {11000101-001111}
 name: STATUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# PLAY_SPEED_UP [raw] {11000101-100110}
 name: PLAY_SPEED_UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 26 00 00 00
 #
+# PLAY_SPEED_DN [raw] {11000101-100101}
 name: PLAY_SPEED_DN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 25 00 00 00
 #
+# RECORD [raw] {11000101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# OTR [raw] {11000101-100111}
 name: OTR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 27 00 00 00
 #
+# TRACKING+ [raw] {10000101-001101}
 name: TRACKING+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4D 00 00 00
 #
+# TRACKING- [raw] {10100101-001110}
 name: TRACKING-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4E 00 00 00
 #
+# MEMO [raw] {11100101-111011}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
+# SP/SLP [raw] {11100101-111010}
 name: SP/SLP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# AUDIO [raw] {11100101-100011}
 name: AUDIO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# PICT_CONTROL [raw] {10100101-000110}
 name: PICT_CONTROL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 46 00 00 00
 #
+# VCR/TV [raw] {11100101-111110}
 name: VCR/TV
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# CLK_CNT [raw] {11100101-111100}
 name: CLK_CNT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3C 00 00 00
 #
+# VESS_<< [raw] {10100101-110001}
 name: VESS_<<
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 71 00 00 00
 #
+# VESS_>> [raw] {10100101-110000}
 name: VESS_>>
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 896 896 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 90166
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 70 00 00 00
 #
+# VARIABLE_PLAY [raw] {11100101-101000}
 name: VARIABLE_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 28 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/VCR_MV-830_(EVEN).ir b/_Converted_/Pronto/M/Marantz/VCR_MV-830_(EVEN).ir
index fb1fa78a..8b5ccc05 100644
--- a/_Converted_/Pronto/M/Marantz/VCR_MV-830_(EVEN).ir
+++ b/_Converted_/Pronto/M/Marantz/VCR_MV-830_(EVEN).ir
@@ -1,278 +1,324 @@
 Filetype: IR signals file
 Version: 1
 #
+# TV_POWER [raw] {11010111-000110}
 name: TV_POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 06 00 00 00
 #
+# POWER [raw] {11000101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# TV_MUTE [raw] {11110111-100000}
 name: TV_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 20 00 00 00
 #
+# TV_VOL+ [raw] {11110111-110000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# TV_VOL- [raw] {11110111-111110}
 name: TV_VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 90166
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3E 00 00 00
 #
+# EJECT [raw] {11100101-101101}
 name: EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 2D 00 00 00
 #
+# TV_CH+ [raw] {11110111-110011}
 name: TV_CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 33 00 00 00
 #
+# TV_CH- [raw] {11010111-110110}
 name: TV_CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# PLAY [raw] {11000101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# REW [raw] {11000101-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11000101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11000101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11000101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# SKIP [raw] {10100101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
+# 1 [raw] {11000101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11000101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11000101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11000101-000100}
 name: 4
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 896 896 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 896 896 90166
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11000101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11000101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11000101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11000101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11000101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11000101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# 100 [raw] {11000101-001010}
 name: 100
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0A 00 00 00
 #
+# CH+ [raw] {11000101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11000101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR+ [raw] {10000101-000101}
 name: VCR+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 45 00 00 00
 #
+# MENU [raw] {11000101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# CLEAR [raw] {11000101-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# STATUS [raw] {11100101-001111}
 name: STATUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# F_TRK [raw] {11100101-100110}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 26 00 00 00
 #
+# R_TRK [raw] {11100101-100101}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 25 00 00 00
 #
+# RECORD [raw] {11100101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# OTR [raw] {11100101-100111}
 name: OTR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 27 00 00 00
 #
+# TRACKING+ [raw] {10100101-001101}
 name: TRACKING+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4D 00 00 00
 #
+# TRACKING- [raw] {10000101-001110}
 name: TRACKING-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4E 00 00 00
 #
+# MEMO [raw] {11000101-111011}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
+# SP/SLP [raw] {11000101-111010}
 name: SP/SLP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# AUDIO [raw] {11000101-100011}
 name: AUDIO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# PICT_CONTROL [raw] {10000101-000110}
 name: PICT_CONTROL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 46 00 00 00
 #
+# TV/VCR [raw] {11000101-111110}
 name: TV/VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# CLK_CNT [raw] {11000101-111100}
 name: CLK_CNT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3C 00 00 00
 #
+# VESS_<< [raw] {10000101-110001}
 name: VESS_<<
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 71 00 00 00
 #
+# VESS_>> [raw] {10000101-110000}
 name: VESS_>>
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 70 00 00 00
 #
+# VARIABLE_PLAY [raw] {11000101-101000}
 name: VARIABLE_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 28 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/VCR_MV-830_(ODD).ir b/_Converted_/Pronto/M/Marantz/VCR_MV-830_(ODD).ir
index e1c4679d..22090e5a 100644
--- a/_Converted_/Pronto/M/Marantz/VCR_MV-830_(ODD).ir
+++ b/_Converted_/Pronto/M/Marantz/VCR_MV-830_(ODD).ir
@@ -1,278 +1,324 @@
 Filetype: IR signals file
 Version: 1
 #
+# TV_POWER [raw] {11110111-000110}
 name: TV_POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 06 00 00 00
 #
+# POWER [raw] {11100101-001100}
 name: POWER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0C 00 00 00
 #
+# TV_MUTE [raw] {11010111-100000}
 name: TV_MUTE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 1791 1791 1791 1791 896 896 896 896 896 896 1791 896 896 896 896 896 896 896 896 90166
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 20 00 00 00
 #
+# TV_VOL+ [raw] {11010111-110000}
 name: TV_VOL+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 30 00 00 00
 #
+# TV_VOL- [raw] {11010111-111110}
 name: TV_VOL-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 3E 00 00 00
 #
+# EJECT [raw] {11000101-101101}
 name: EJECT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 2D 00 00 00
 #
+# TV_CH+ [raw] {11010111-110011}
 name: TV_CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 33 00 00 00
 #
+# TV_CH- [raw] {11110111-110110}
 name: TV_CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 888 888 1776 1776 888 888 888 888 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 17 00 00 00
+command: 36 00 00 00
 #
+# PLAY [raw] {11100101-110101}
 name: PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 35 00 00 00
 #
+# REW [raw] {11100101-110010}
 name: REW
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 32 00 00 00
 #
+# FFWD [raw] {11100101-110100}
 name: FFWD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 34 00 00 00
 #
+# STOP [raw] {11100101-110110}
 name: STOP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 36 00 00 00
 #
+# PAUSE [raw] {11100101-101001}
 name: PAUSE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 29 00 00 00
 #
+# SKIP [raw] {10000101-101010}
 name: SKIP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 888 888 1776 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 6A 00 00 00
 #
+# 1 [raw] {11100101-000001}
 name: 1
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 01 00 00 00
 #
+# 2 [raw] {11100101-000010}
 name: 2
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 02 00 00 00
 #
+# 3 [raw] {11100101-000011}
 name: 3
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 03 00 00 00
 #
+# 4 [raw] {11100101-000100}
 name: 4
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 04 00 00 00
 #
+# 5 [raw] {11100101-000101}
 name: 5
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 05 00 00 00
 #
+# 6 [raw] {11100101-000110}
 name: 6
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 06 00 00 00
 #
+# 7 [raw] {11100101-000111}
 name: 7
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 07 00 00 00
 #
+# 8 [raw] {11100101-001000}
 name: 8
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 08 00 00 00
 #
+# 9 [raw] {11100101-001001}
 name: 9
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 09 00 00 00
 #
+# 0 [raw] {11100101-000000}
 name: 0
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 00 00 00 00
 #
+# 100 [raw] {11100101-001010}
 name: 100
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 888 888 1776 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0A 00 00 00
 #
+# CH+ [raw] {11100101-100000}
 name: CH+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 20 00 00 00
 #
+# CH- [raw] {11100101-100001}
 name: CH-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 21 00 00 00
 #
+# VCR+ [raw] {10100101-000101}
 name: VCR+
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 896 896 1791 1791 1791 1791 896 896 896 896 1791 1791 1791 896 89299
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 45 00 00 00
 #
+# MENU [raw] {11100101-011101}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 1776 1776 888 888 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 1D 00 00 00
 #
+# CLEAR [raw] {11100101-110001}
 name: CLEAR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 31 00 00 00
 #
+# STATUS [raw] {11000101-001111}
 name: STATUS
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 0F 00 00 00
 #
+# F_TRK [raw] {11000101-100110}
 name: F_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 26 00 00 00
 #
+# R_TRK [raw] {11000101-100101}
 name: R_TRK
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 25 00 00 00
 #
+# RECORD [raw] {11000101-110111}
 name: RECORD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 888 888 1776 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 37 00 00 00
 #
+# OTR [raw] {11000101-100111}
 name: OTR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 1776 1776 1776 888 888 1776 888 888 1776 888 888 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 27 00 00 00
 #
+# TRACKING+ [raw] {10000101-001101}
 name: TRACKING+
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 888 1776 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4D 00 00 00
 #
+# TRACKING- [raw] {10100101-001110}
 name: TRACKING-
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 1776 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 4E 00 00 00
 #
+# MEMO [raw] {11100101-111011}
 name: MEMO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3B 00 00 00
 #
+# SP/SLP [raw] {11100101-111010}
 name: SP/SLP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3A 00 00 00
 #
+# AUDIO [raw] {11100101-100011}
 name: AUDIO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 888 888 888 888 1776 888 888 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 23 00 00 00
 #
+# PICT_CONTROL [raw] {10100101-000110}
 name: PICT_CONTROL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 1776 888 888 888 888 1776 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 46 00 00 00
 #
+# TV/VCR [raw] {11100101-111110}
 name: TV/VCR
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3E 00 00 00
 #
+# CLK_CNT [raw] {11100101-111100}
 name: CLK_CNT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 3C 00 00 00
 #
+# VESS_<< [raw] {10100101-110001}
 name: VESS_<<
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 1776 888 888 888 888 1776 888 89305
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 71 00 00 00
 #
+# VESS_>> [raw] {10100101-110000}
 name: VESS_>>
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 896 896 1791 1791 1791 896 896 896 896 1791 896 896 896 896 896 896 90166
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 70 00 00 00
 #
+# VARIABLE_PLAY [raw] {11100101-101000}
 name: VARIABLE_PLAY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 1776 1776 1776 888 888 1776 1776 1776 888 888 888 888 90193
+type: parsed
+protocol: RC5
+address: 05 00 00 00
+command: 28 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/VP12S2.ir b/_Converted_/Pronto/M/Marantz/VP12S2.ir
index 953856eb..ad46cd72 100644
--- a/_Converted_/Pronto/M/Marantz/VP12S2.ir
+++ b/_Converted_/Pronto/M/Marantz/VP12S2.ir
@@ -1,146 +1,170 @@
 Filetype: IR signals file
 Version: 1
 #
+# STBY [raw] {11000000-001100}
 name: STBY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0C 00 00 00
 #
+# POWER_ON [raw] {11100000-111111}
 name: POWER_ON
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# UP [raw] {11000000-011100}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 1C 00 00 00
 #
+# LEFT [raw] {11100000-101100}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2C 00 00 00
 #
+# RIGHT [raw] {11000000-101011}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2B 00 00 00
 #
+# DOWN [raw] {11100000-011101}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 1D 00 00 00
 #
-name: COMPONENT
+# COMPONENT [0 56 1] {110-00000--111000-000001}
+name: COMPONENT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75350
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: S_VIDEO
+# S_VIDEO [0 56 2] {110-00000--111000-000010}
+name: S_VIDEO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
+# ENTER [raw] {10000000-010111}
 name: ENTER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 57 00 00 00
 #
-name: VIDEO
+# VIDEO [0 56 3] {110-00000--111000-000011}
+name: VIDEO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 75551
 #
-name: RGB
+# RGB [0 56 4] {110-00000--111000-000100}
+name: RGB (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 889 889 76440
 #
+# MENU [raw] {11100000-101110}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2E 00 00 00
 #
-name: THEATER
+# THEATER [0 31 2] {110-00000--011111-000010}
+name: THEATER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 1778 1778 76440
 #
-name: STANDARD
+# STANDARD [0 31 1] {110-00000--011111-000001}
+name: STANDARD (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: DYNAMIC
+# DYNAMIC [0 31 3] {110-00000--011111-000011}
+name: DYNAMIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# INFO [raw] {11100000-001111}
 name: INFO
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0F 00 00 00
 #
+# FULL [raw] {10000000-111110}
 name: FULL
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 7E 00 00 00
 #
-name: NORMAL
+# NORMAL [0 125 2] {100-00000--111101-000010}
+name: NORMAL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 76238
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 1778 1778 76440
 #
+# CINEMA [raw] {10000000-110110}
 name: CINEMA
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 76 00 00 00
 #
-name: THROUGH
+# THROUGH [0 125 1] {100-00000--111101-000001}
+name: THROUGH (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# ZOOM [raw] {10000000-110100}
 name: ZOOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 74 00 00 00
 #
-name: AUX
+# AUX [0 56 5] {110-00000--111000-000101}
+name: AUX (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 1778 889 75551
 #
-name: FOCUS
+# FOCUS [0 15 1] {110-00000--001111-000001}
+name: FOCUS (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 4439 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# V_MUTE [raw] {11100000-001101}
 name: V_MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/VP8100.ir b/_Converted_/Pronto/M/Marantz/VP8100.ir
index c5488d7c..db190e8b 100644
--- a/_Converted_/Pronto/M/Marantz/VP8100.ir
+++ b/_Converted_/Pronto/M/Marantz/VP8100.ir
@@ -1,146 +1,170 @@
 Filetype: IR signals file
 Version: 1
 #
+# STBY [raw] {11000000-001100}
 name: STBY
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0C 00 00 00
 #
+# POWER_ON [raw] {11100000-111111}
 name: POWER_ON
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 3F 00 00 00
 #
+# UP [raw] {11100000-011100}
 name: UP
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 1C 00 00 00
 #
+# LEFT [raw] {11000000-101100}
 name: LEFT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2C 00 00 00
 #
+# RIGHT [raw] {11100000-101011}
 name: RIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 1776 1776 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2B 00 00 00
 #
+# DOWN [raw] {11000000-011101}
 name: DOWN
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 1D 00 00 00
 #
-name: COMPONENT
+# COMPONENT [0 56 1] {110-00000--111000-000001}
+name: COMPONENT (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: S-VIDEO
+# S-VIDEO [0 56 2] {110-00000--111000-000010}
+name: S-VIDEO (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 1778 76440
 #
+# ENTER [raw] {10100000-010111}
 name: ENTER
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 57 00 00 00
 #
-name: VIDEO1
+# VIDEO1 [0 56 3] {110-00000--111000-000011}
+name: VIDEO1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 889 889 1778 889 889 889 75551
 #
-name: RGB1
+# RGB1 [0 56 4] {110-00000--111000-000100}
+name: RGB1 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 1776 1776 888 888 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 1778 889 889 889 889 889 889 889 889 889 889 1778 1778 889 889 76440
 #
+# MENU [raw] {11100000-101110}
 name: MENU
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2E 00 00 00
 #
-name: THEATER
+# THEATER [0 31 2] {110-00000--011111-000010}
+name: THEATER (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 1778 1778 76440
 #
-name: NORMAL
+# NORMAL [0 31 1] {110-00000--011111-000001}
+name: NORMAL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
-name: DYNAMIC
+# DYNAMIC [0 31 3] {110-00000--011111-000011}
+name: DYNAMIC (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 1776 888 888 888 888 888 888 888 888 888 888 4439 888 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 1776 888 888 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 889 889 1778 889 889 889 889 889 889 889 889 889 889 4445 889 1778 889 889 889 889 889 889 889 889 1778 889 889 889 889 889 889 1778 889 889 889 75551
 #
+# OSD [raw] {11100000-001111}
 name: OSD
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0F 00 00 00
 #
-name: FULL
+# FULL [0 125 1] {100-00000--111101-000001}
+name: FULL (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 5327 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 75378
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 889 889 1778 889 75551
 #
+# SQUEEZE [raw] {10100000-111110}
 name: SQUEEZE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 888 888 888 888 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 7E 00 00 00
 #
+# 2-3P/D [raw] {10000000-110110}
 name: 2-3P/D
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 1776 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 76 00 00 00
 #
-name: 4:3
+# 4:3 [0 125 2] {100-00000--111101-000010}
+name: 4:3 (raw)
 type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 5327 888 888 888 888 888 888 1776 1776 1776 888 888 888 888 888 888 1776 1776 76266
+frequency: 36000
+duty_cycle: 0.25
+data: 1778 889 889 889 889 889 889 889 889 889 889 889 889 5334 889 889 889 889 889 889 1778 1778 1778 889 889 889 889 889 889 1778 1778 76440
 #
+# ZOOM [raw] {10000000-110100}
 name: ZOOM
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 1776 888 888 90443
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 74 00 00 00
 #
+# B-LIGHT [raw] {10100000-110111}
 name: B-LIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 1776 1776 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 888 888 888 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 77 00 00 00
 #
+# P-LIGHT [raw] {10000000-101001}
 name: P-LIGHT
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 1776 1776 1776 888 888 1776 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 69 00 00 00
 #
+# V-MUTE [raw] {11100000-001101}
 name: V-MUTE
-type: raw
-frequency: 36045
-duty_cycle: 0.330000
-data: 888 888 888 888 1776 888 888 888 888 888 888 888 888 888 888 888 888 1776 888 888 1776 1776 888 89555
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
diff --git a/_Converted_/Pronto/M/Marantz/XV5260.ir b/_Converted_/Pronto/M/Marantz/XV5260.ir
index a68f2682..b654e73a 100644
--- a/_Converted_/Pronto/M/Marantz/XV5260.ir
+++ b/_Converted_/Pronto/M/Marantz/XV5260.ir
@@ -13,11 +13,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 88767
 #
+# STATUS [raw] {11100000-001111}
 name: STATUS
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0F 00 00 00
 #
 name: SURF
 type: raw
@@ -31,23 +32,26 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 88767
 #
+# VOL- [raw] {11100000-010001}
 name: VOL-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 11 00 00 00
 #
+# MUTE [raw] {11100000-001101}
 name: MUTE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 896 1791 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 0D 00 00 00
 #
+# INFO [raw] {11100011-101101}
 name: INFO
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 1791 896 896 896 896 1791 1791 896 896 1791 1791 896 88767
+type: parsed
+protocol: RC5
+address: 03 00 00 00
+command: 2D 00 00 00
 #
 name: GUIDE_ON/OFF
 type: raw
@@ -61,11 +65,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 896 896 88767
 #
+# CH- [raw] {11100000-100001}
 name: CH-
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 896 896 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 21 00 00 00
 #
 name: PIP
 type: raw
@@ -73,17 +78,19 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 1791 1791 88767
 #
+# POSITION [raw] {11100000-101111}
 name: POSITION
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 1791 1791 896 896 896 896 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2F 00 00 00
 #
+# SWAP [raw] {11100000-110111}
 name: SWAP
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 37 00 00 00
 #
 name: FREEZE
 type: raw
@@ -91,17 +98,19 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 896 896 1791 1791 896 896 1791 88767
 #
+# SIZE [raw] {11100000-010011}
 name: SIZE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 1791 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 13 00 00 00
 #
+# INPUT_CYCLE [raw] {10100000-001011}
 name: INPUT_CYCLE
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 1791 1791 1791 868 896 896 896 896 896 896 896 896 896 896 896 1791 1791 1791 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 4B 00 00 00
 #
 name: TV/VCR
 type: raw
@@ -121,11 +130,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 1791 1791 1791 88767
 #
+# 1 [raw] {11100000-000001}
 name: 1
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 01 00 00 00
 #
 name: 2
 type: raw
@@ -133,11 +143,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 1791 88767
 #
+# 3 [raw] {11100000-000011}
 name: 3
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 03 00 00 00
 #
 name: 4
 type: raw
@@ -145,11 +156,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 88767
 #
+# 5 [raw] {11100000-000101}
 name: 5
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 1791 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 05 00 00 00
 #
 name: 6
 type: raw
@@ -157,11 +169,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 896 1791 88767
 #
+# 7 [raw] {11100000-000111}
 name: 7
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 07 00 00 00
 #
 name: 8
 type: raw
@@ -169,11 +182,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 896 896 88767
 #
+# 9 [raw] {11100000-001001}
 name: 9
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 896 896 1791 1791 896 896 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 09 00 00 00
 #
 name: 0
 type: raw
@@ -193,11 +207,12 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 896 896 88767
 #
+# DOWN [raw] {11100000-011101}
 name: DOWN
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 896 896 1791 896 896 896 896 1791 1791 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 1D 00 00 00
 #
 name: LEFT
 type: raw
@@ -205,8 +220,9 @@ frequency: 35734
 duty_cycle: 0.330000
 data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 1791 1791 896 896 1791 896 896 88767
 #
+# RIGHT [raw] {11100000-101011}
 name: RIGHT
-type: raw
-frequency: 35734
-duty_cycle: 0.330000
-data: 896 896 896 896 1791 896 896 896 896 896 896 896 896 1791 1791 1791 1791 1791 896 896 896 88767
+type: parsed
+protocol: RC5
+address: 00 00 00 00
+command: 2B 00 00 00