diff --git a/TVs/Samsung.ir b/TVs/Samsung.ir
index 5949d82a..91820ba7 100644
--- a/TVs/Samsung.ir
+++ b/TVs/Samsung.ir
@@ -7,60 +7,12 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 02 00 00 00
 # 
-name: Up
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 60 00 00 00
-# 
-name: Left
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 65 00 00 00
-# 
-name: Select
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 68 00 00 00
-# 
-name: Right
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 62 00 00 00
-# 
-name: Down
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 61 00 00 00
-# 
-name: Menu
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 1A 00 00 00
-# 
 name: Source
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 01 00 00 00
 # 
-name: Return
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 58 00 00 00
-# 
-name: Exit
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 2D 00 00 00
-# 
 name: Vol_up
 type: parsed
 protocol: Samsung32
@@ -79,6 +31,54 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 0F 00 00 00
 # 
+name: Up
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 60 00 00 00
+# 
+name: Down
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 61 00 00 00
+# 
+name: Left
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 65 00 00 00
+# 
+name: Right
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 62 00 00 00
+# 
+name: Select
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 68 00 00 00
+# 
+name: Return
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 58 00 00 00
+# 
+name: Menu
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 1A 00 00 00
+# 
+name: Exit
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 2D 00 00 00
+# 
 name: Smarthub
 type: parsed
 protocol: Samsung32
@@ -90,3 +90,177 @@ type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 1F 00 00 00
+# 
+name: Search
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 73 00 00 00
+# 
+name: 1
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 04 00 00 00
+# 
+name: 2
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 05 00 00 00
+# 
+name: 3
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 06 00 00 00
+# 
+name: 4
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 08 00 00 00
+# 
+name: 5
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 09 00 00 00
+# 
+name: 6
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 0A 00 00 00
+# 
+name: 7
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 0C 00 00 00
+# 
+name: 8
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 0D 00 00 00
+# 
+name: 9
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 0E 00 00 00
+# 
+name: 0
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 11 00 00 00
+# 
+name: -
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 23 00 00 00
+# 
+name: Prev_channel
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 13 00 00 00
+# 
+name: Family_story
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: C6 00 00 00
+# 
+name: MTS
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 00 00 00 00
+# 
+name: SRS
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 6E 00 00 00
+# 
+name: Support
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 3F 00 00 00
+# 
+name: Picture_size
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 3E 00 00 00
+# 
+name: Closed_Captions
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 25 00 00 00
+# 
+name: Rewind
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 45 00 00 00
+# 
+name: Fast_Forward
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 48 00 00 00
+# 
+name: Pause
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 4A 00 00 00
+# 
+name: Play
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 47 00 00 00
+# 
+name: Stop
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 46 00 00 00
+# 
+name: Record
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 49 00 00 00
+# 
+name: A_button
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 6C 00 00 00
+# 
+name: B_button
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 14 00 00 00
+# 
+name: C_button
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 15 00 00 00
+# 
+name: D_button
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 16 00 00 00
\ No newline at end of file
diff --git a/TVs/Samsung_TV.ir b/TVs/Samsung_TV.ir
index d9318974..18b51054 100644
--- a/TVs/Samsung_TV.ir
+++ b/TVs/Samsung_TV.ir
@@ -13,12 +13,6 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 01 00 00 00
 # 
-name: Mute
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 0F 00 00 00
-# 
 name: Vol_up
 type: parsed
 protocol: Samsung32
@@ -31,31 +25,43 @@ protocol: Samsung32
 address: 07 00 00 00
 command: 0B 00 00 00
 # 
-name: Menu_left
+name: Mute
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
-command: 65 00 00 00
+command: 0F 00 00 00
 # 
-name: Menu_up
+name: Up
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 60 00 00 00
 # 
-name: Menu_right
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 62 00 00 00
-# 
-name: Menu_down
+name: Down
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 61 00 00 00
 # 
-name: Menu_back
+name: Left
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 65 00 00 00
+# 
+name: Right
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 62 00 00 00
+# 
+name: Enter
+type: parsed
+protocol: Samsung32
+address: 07 00 00 00
+command: 68 00 00 00
+# 
+name: Back
 type: parsed
 protocol: Samsung32
 address: 07 00 00 00
@@ -66,9 +72,3 @@ type: parsed
 protocol: Samsung32
 address: 07 00 00 00
 command: 79 00 00 00
-# 
-name: Menu_enter
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: 68 00 00 00
diff --git a/TVs/Samsung_e6.ir b/TVs/Samsung_e6.ir
deleted file mode 100755
index c43e24e5..00000000
--- a/TVs/Samsung_e6.ir
+++ /dev/null
@@ -1,8 +0,0 @@
-Filetype: IR signals file
-Version: 1
-# 
-name: Power
-type: parsed
-protocol: Samsung32
-address: 07 00 00 00
-command: E6 00 00 00