42 files changed, 543 insertions, 15 deletions
diff --git a/us_maker_edition/game/themes/Classic.ini b/us_maker_edition/game/themes/Classic.ini
index 531f6223..3e856aae 100644
--- a/us_maker_edition/game/themes/Classic.ini
+++ b/us_maker_edition/game/themes/Classic.ini
@@ -8463,3 +8463,91 @@ Font = 1
 Size = 18
 Align = 1
 
+[EditSubBarStatic1]
+Tex = PlayOnly
+X = 350
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic2]
+Tex = playwithnote
+X = 376
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic3]
+Tex = playnote
+X = 402
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic4]
+Tex = previousseq
+X = 363
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic5]
+Tex = nextseq
+X = 389
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic6]
+Tex = gold
+X = 440
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic7]
+Tex = freestyle
+X = 440
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic8]
+Tex = undo
+X = 320
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
diff --git a/us_maker_edition/game/themes/Classic/Star.ini b/us_maker_edition/game/themes/Classic/Star.ini
index e72bdbec..4447708e 100644
--- a/us_maker_edition/game/themes/Classic/Star.ini
+++ b/us_maker_edition/game/themes/Classic/Star.ini
@@ -243,4 +243,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Classic/[editsub]freestyle.png b/us_maker_edition/game/themes/Classic/[editsub]freestyle.png
new file mode 100644
index 00000000..4ea1dc29
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]freestyle.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]gold.png b/us_maker_edition/game/themes/Classic/[editsub]gold.png
new file mode 100644
index 00000000..ed14a507
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]gold.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]next-seq.png b/us_maker_edition/game/themes/Classic/[editsub]next-seq.png
new file mode 100644
index 00000000..ac91f35b
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]next-seq.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]play-note.png b/us_maker_edition/game/themes/Classic/[editsub]play-note.png
new file mode 100644
index 00000000..dba67b21
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]play-note.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]play-with-note.png b/us_maker_edition/game/themes/Classic/[editsub]play-with-note.png
new file mode 100644
index 00000000..1ed7241a
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]play-with-note.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]play.png b/us_maker_edition/game/themes/Classic/[editsub]play.png
new file mode 100644
index 00000000..bde99838
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]play.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]previous-seq.png b/us_maker_edition/game/themes/Classic/[editsub]previous-seq.png
new file mode 100644
index 00000000..d0ef893f
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]previous-seq.png
diff --git a/us_maker_edition/game/themes/Classic/[editsub]undo.png b/us_maker_edition/game/themes/Classic/[editsub]undo.png
new file mode 100644
index 00000000..62d9da88
--- /dev/null
+++ b/us_maker_edition/game/themes/Classic/[editsub]undo.png
diff --git a/us_maker_edition/game/themes/Deluxe.ini b/us_maker_edition/game/themes/Deluxe.ini
index ed957d76..109afc61 100644
--- a/us_maker_edition/game/themes/Deluxe.ini
+++ b/us_maker_edition/game/themes/Deluxe.ini
@@ -9132,3 +9132,91 @@ Font = 1
 Size = 18
 Align = 1
 
+[EditSubBarStatic1]
+Tex = PlayOnly
+X = 350
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic2]
+Tex = playwithnote
+X = 376
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic3]
+Tex = playnote
+X = 402
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic4]
+Tex = previousseq
+X = 363
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic5]
+Tex = nextseq
+X = 389
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic6]
+Tex = gold
+X = 440
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic7]
+Tex = freestyle
+X = 440
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic8]
+Tex = undo
+X = 320
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
diff --git a/us_maker_edition/game/themes/Deluxe/Blue.ini b/us_maker_edition/game/themes/Deluxe/Blue.ini
index 3ebc04ff..3fafb521 100644
--- a/us_maker_edition/game/themes/Deluxe/Blue.ini
+++ b/us_maker_edition/game/themes/Deluxe/Blue.ini
@@ -232,4 +232,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/Fall.ini b/us_maker_edition/game/themes/Deluxe/Fall.ini
index 4502be61..38e02b20 100644
--- a/us_maker_edition/game/themes/Deluxe/Fall.ini
+++ b/us_maker_edition/game/themes/Deluxe/Fall.ini
@@ -232,4 +232,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/Ocean.ini b/us_maker_edition/game/themes/Deluxe/Ocean.ini
index 8af41f20..97f1dea4 100644
--- a/us_maker_edition/game/themes/Deluxe/Ocean.ini
+++ b/us_maker_edition/game/themes/Deluxe/Ocean.ini
@@ -232,4 +232,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/Ribbon.ini b/us_maker_edition/game/themes/Deluxe/Ribbon.ini
index 06a4dd41..0af9377d 100644
--- a/us_maker_edition/game/themes/Deluxe/Ribbon.ini
+++ b/us_maker_edition/game/themes/Deluxe/Ribbon.ini
@@ -231,4 +231,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/Summer.ini b/us_maker_edition/game/themes/Deluxe/Summer.ini
index 660a5ec7..ebab9ac1 100644
--- a/us_maker_edition/game/themes/Deluxe/Summer.ini
+++ b/us_maker_edition/game/themes/Deluxe/Summer.ini
@@ -232,4 +232,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/Winter.ini b/us_maker_edition/game/themes/Deluxe/Winter.ini
index 71b4dfaa..1ffcdcea 100644
--- a/us_maker_edition/game/themes/Deluxe/Winter.ini
+++ b/us_maker_edition/game/themes/Deluxe/Winter.ini
@@ -232,4 +232,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]freestyle.png b/us_maker_edition/game/themes/Deluxe/[editsub]freestyle.png
new file mode 100644
index 00000000..4ea1dc29
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]freestyle.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]gold.png b/us_maker_edition/game/themes/Deluxe/[editsub]gold.png
new file mode 100644
index 00000000..ed14a507
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]gold.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]next-seq.png b/us_maker_edition/game/themes/Deluxe/[editsub]next-seq.png
new file mode 100644
index 00000000..ac91f35b
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]next-seq.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]play-note.png b/us_maker_edition/game/themes/Deluxe/[editsub]play-note.png
new file mode 100644
index 00000000..dba67b21
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]play-note.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]play-with-note.png b/us_maker_edition/game/themes/Deluxe/[editsub]play-with-note.png
new file mode 100644
index 00000000..1ed7241a
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]play-with-note.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]play.png b/us_maker_edition/game/themes/Deluxe/[editsub]play.png
new file mode 100644
index 00000000..bde99838
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]play.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]previous-seq.png b/us_maker_edition/game/themes/Deluxe/[editsub]previous-seq.png
new file mode 100644
index 00000000..d0ef893f
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]previous-seq.png
diff --git a/us_maker_edition/game/themes/Deluxe/[editsub]undo.png b/us_maker_edition/game/themes/Deluxe/[editsub]undo.png
new file mode 100644
index 00000000..62d9da88
--- /dev/null
+++ b/us_maker_edition/game/themes/Deluxe/[editsub]undo.png
diff --git a/us_maker_edition/game/themes/Verdure.ini b/us_maker_edition/game/themes/Verdure.ini
index 1aa7d135..2ef0e913 100644
--- a/us_maker_edition/game/themes/Verdure.ini
+++ b/us_maker_edition/game/themes/Verdure.ini
@@ -9430,3 +9430,91 @@ Font = 1
 Size = 18
 Align = 1
 
+[EditSubBarStatic1]
+Tex = PlayOnly
+X = 350
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic2]
+Tex = playwithnote
+X = 376
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic3]
+Tex = playnote
+X = 402
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic4]
+Tex = previousseq
+X = 363
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic5]
+Tex = nextseq
+X = 389
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic6]
+Tex = gold
+X = 440
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic7]
+Tex = freestyle
+X = 440
+Y = 245
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
+[EditSubBarStatic8]
+Tex = undo
+X = 320
+Y = 219
+W = 24
+H = 24
+Type = Transparent
+Color = ColorLight
+Reflection = 0
+ReflectionSpacing = 31
+
diff --git a/us_maker_edition/game/themes/Verdure/Drippin.ini b/us_maker_edition/game/themes/Verdure/Drippin.ini
index bda3141f..cabc79ac 100644
--- a/us_maker_edition/game/themes/Verdure/Drippin.ini
+++ b/us_maker_edition/game/themes/Verdure/Drippin.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/Drippin_Low.ini b/us_maker_edition/game/themes/Verdure/Drippin_Low.ini
index 183e7405..c5dde5af 100644
--- a/us_maker_edition/game/themes/Verdure/Drippin_Low.ini
+++ b/us_maker_edition/game/themes/Verdure/Drippin_Low.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/Drippin_Static.ini b/us_maker_edition/game/themes/Verdure/Drippin_Static.ini
index c9b0fc10..8c9e26e1 100644
--- a/us_maker_edition/game/themes/Verdure/Drippin_Static.ini
+++ b/us_maker_edition/game/themes/Verdure/Drippin_Static.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/Springtime.ini b/us_maker_edition/game/themes/Verdure/Springtime.ini
index 52e69d18..eb3dd9ea 100644
--- a/us_maker_edition/game/themes/Verdure/Springtime.ini
+++ b/us_maker_edition/game/themes/Verdure/Springtime.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/Springtime_Low.ini b/us_maker_edition/game/themes/Verdure/Springtime_Low.ini
index 93e91ac4..37404087 100644
--- a/us_maker_edition/game/themes/Verdure/Springtime_Low.ini
+++ b/us_maker_edition/game/themes/Verdure/Springtime_Low.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/Springtime_Static.ini b/us_maker_edition/game/themes/Verdure/Springtime_Static.ini
index 999c1b02..7d6e3b62 100644
--- a/us_maker_edition/game/themes/Verdure/Springtime_Static.ini
+++ b/us_maker_edition/game/themes/Verdure/Springtime_Static.ini
@@ -238,4 +238,14 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
-\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png
+
+# # # E D I T # # #
+PlayOnly = [editsub]play.png
+playwithnote = [editsub]play-with-note.png
+playnote = [editsub]play-note.png
+nextseq = [editsub]next-seq.png
+previousseq = [editsub]previous-seq.png
+undo = [editsub]undo.png
+gold = [editsub]gold.png
+freestyle = [editsub]freestyle.png
+\ No newline at end of file
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]freestyle.png b/us_maker_edition/game/themes/Verdure/[editsub]freestyle.png
new file mode 100644
index 00000000..4ea1dc29
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]freestyle.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]gold.png b/us_maker_edition/game/themes/Verdure/[editsub]gold.png
new file mode 100644
index 00000000..ed14a507
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]gold.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]next-seq.png b/us_maker_edition/game/themes/Verdure/[editsub]next-seq.png
new file mode 100644
index 00000000..ac91f35b
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]next-seq.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]play-note.png b/us_maker_edition/game/themes/Verdure/[editsub]play-note.png
new file mode 100644
index 00000000..dba67b21
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]play-note.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]play-with-note.png b/us_maker_edition/game/themes/Verdure/[editsub]play-with-note.png
new file mode 100644
index 00000000..1ed7241a
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]play-with-note.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]play.png b/us_maker_edition/game/themes/Verdure/[editsub]play.png
new file mode 100644
index 00000000..bde99838
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]play.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]previous-seq.png b/us_maker_edition/game/themes/Verdure/[editsub]previous-seq.png
new file mode 100644
index 00000000..d0ef893f
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]previous-seq.png
diff --git a/us_maker_edition/game/themes/Verdure/[editsub]undo.png b/us_maker_edition/game/themes/Verdure/[editsub]undo.png
new file mode 100644
index 00000000..62d9da88
--- /dev/null
+++ b/us_maker_edition/game/themes/Verdure/[editsub]undo.png
diff --git a/us_maker_edition/src/base/UThemes.pas b/us_maker_edition/src/base/UThemes.pas
index 49340038..db850be2 100644
--- a/us_maker_edition/src/base/UThemes.pas
+++ b/us_maker_edition/src/base/UThemes.pas
@@ -510,6 +510,16 @@ type
       BackgroundImage:     TThemeStatic;
       ButtonCurrentLine:   TThemeButton;
       ButtonCurrentNote:   TThemeButton;
+      // buttons
+      PlayOnly:             TThemeButton;
+      PlayWithNote:         TThemeButton;
+      PlayNote:             TThemeButton;
+      previousseq:          TThemeButton;
+      nextseq:              TThemeButton;
+      undo:                 TThemeButton;
+      gold:                 TThemeButton;
+      freestyle:            TThemeButton;
+
       SlideTitle:          TThemeSelectSlide;
       SlideArtist:         TThemeSelectSlide;
       SlideMP3:            TThemeSelectSlide;
@@ -1412,6 +1422,14 @@ begin
       // current position in editor
       ThemeLoadButton(EditSub.ButtonCurrentLine, 'EditSubButtonCurrentLine');
       ThemeLoadButton(EditSub.ButtonCurrentNote, 'EditSubButtonCurrentNote');
+      ThemeLoadButton(EditSub.PlayOnly,    'EditSubBarStatic1');
+      ThemeLoadButton(EditSub.PlayWithNote,    'EditSubBarStatic2');
+      ThemeLoadButton(EditSub.PlayNote,    'EditSubBarStatic3');
+      ThemeLoadButton(EditSub.previousseq,    'EditSubBarStatic4');
+      ThemeLoadButton(EditSub.nextseq,    'EditSubBarStatic5');
+      ThemeLoadButton(EditSub.gold,    'EditSubBarStatic6');
+      ThemeLoadButton(EditSub.freestyle,    'EditSubBarStatic7');
+      ThemeLoadButton(EditSub.undo,    'EditSubBarStatic8');
       ThemeLoadSelectSlide(EditSub.SlideTitle, 'EditSubTitle');
       ThemeLoadSelectSlide(EditSub.SlideArtist, 'EditSubArtist');
       ThemeLoadSelectSlide(EditSub.SlideMP3, 'EditSubMP3');
diff --git a/us_maker_edition/src/screens/UScreenEditSub.pas b/us_maker_edition/src/screens/UScreenEditSub.pas
index aab5d9bd..920b8172 100644
--- a/us_maker_edition/src/screens/UScreenEditSub.pas
+++ b/us_maker_edition/src/screens/UScreenEditSub.pas
@@ -117,7 +117,7 @@ type
       LastPressedMouseType:   integer;
       LastPressedNote:        integer;
       PressedNoteId:          integer;
-            
+
       TextPosition:     integer;
       TextEditMode:     boolean;
       TitleEditMode:    boolean;
@@ -198,6 +198,8 @@ type
       VolumeAudio:    array of UTF8String;
       VolumeMidi:    array of UTF8String;
       VolumeClick:    array of UTF8String;
+      // control buttons
+      UndoButtonId:       integer;
       // background image & video preview
       BackgroundImageId:  integer;
       Empty:         array of UTF8String;   //temporary variable to initialize slide - todo change
@@ -211,7 +213,7 @@ type
       LastX:              integer;
       LastY:              integer;
       Xmouse:             integer;
-      
+
       resize_note_left:   boolean;
       resize_note_right:  boolean;
       move_note:          boolean;
@@ -848,6 +850,110 @@ begin
              TextEditMode := true;
            end;
 
+           if Interaction = 17 then //Only Play
+           begin
+              // Play Sentence
+              Click := true;
+              AudioPlayback.Stop;
+              PlayVideo := false;
+              StopVideoPreview;
+              Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+              CurrentNote := 0;
+              R := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[0].Start);
+              if R <= AudioPlayback.Length then
+              begin
+                AudioPlayback.Position := R;
+                PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].End_);
+                PlaySentence := true;
+                AudioPlayback.SetVolume(SelectsS[VolumeAudioSlideId].SelectedOption / 100);
+                AudioPlayback.Play;
+                LastClick := -100;
+              end;
+              Text[TextDebug].Text := Language.Translate('INFO_PLAY_SENTENCE');
+           end;
+
+           if Interaction = 18 then //Play with midi
+           begin
+              Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+              CurrentNote := 0;
+              PlaySentenceMidi := true;
+              PlayVideo := false;
+              StopVideoPreview;
+              MidiTime  := USTime.GetTime;
+              MidiStart := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[0].Start);
+              MidiStop  := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].End_);
+              LastClick := -100;
+
+              PlaySentence := true;
+              Click := true;
+              AudioPlayback.Stop;
+              AudioPlayback.Position := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[0].Start)+0{-0.10};
+              PlayStopTime := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].End_)+0;
+              AudioPlayback.SetVolume(SelectsS[VolumeAudioSlideId].SelectedOption / 100);
+              AudioPlayback.Play;
+              LastClick := -100;
+              Text[TextDebug].Text := Language.Translate('INFO_PLAY_SENTENCE');
+           end;
+
+           if Interaction = 19 then //Play midi
+           begin
+              Lines[0].Line[Lines[0].Current].Note[CurrentNote].Color := 1;
+              CurrentNote := 0;
+              PlaySentenceMidi := true;
+              PlayVideo := false;
+              StopVideoPreview;
+              MidiTime := USTime.GetTime;
+              MidiStart := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].Note[0].Start);
+              MidiStop := GetTimeFromBeat(Lines[0].Line[Lines[0].Current].End_);
+
+              LastClick := -100;
+              Text[TextDebug].Text := Language.Translate('INFO_PLAY_SENTENCE');
+           end;
+
+           if Interaction = 20 then //previous sequence
+           begin
+              PreviousSentence;
+           end;
+
+           if Interaction = 21 then //next sequence
+           begin
+              NextSentence;
+           end;
+
+           if Interaction = 22 then //undo
+           begin
+              CopyFromUndo;
+              GoldenRec.KillAll;
+              Text[TextDebug].Text := Language.Translate('INFO_UNDO');
+              ShowInteractiveBackground;
+           end;
+
+           if Interaction = 23 then //golden note
+           begin
+              CopyToUndo;
+              if (Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType = ntGolden) then
+                Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := ntNormal
+              else
+                Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := ntGolden;
+              GoldenRec.KillAll;
+              Exit;
+           end;
+
+           if Interaction = 24 then //freestyle note
+           begin
+              CopyToUndo;
+              if (Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType = ntFreestyle) then
+                Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := ntNormal
+              else
+                Lines[0].Line[Lines[0].Current].Note[CurrentNote].NoteType := ntFreestyle;
+          	  GoldenRec.KillAll;
+
+              // update lyrics
+              Lyric.AddLine(Lines[0].Current);
+              Lyric.Selected := CurrentNote;
+              Exit;
+           end;
+
            for i := 0 to Lines[0].High do
            begin
               if Interaction = InteractiveLineId[i] then
@@ -2773,6 +2879,16 @@ begin
     Statics[playerIconId[2]].Reflection := false;
     Statics[playerIconId[2]].Visible := false;
 
+    // control buttons
+    AddButton(Theme.EditSub.PlayOnly);
+    AddButton(Theme.EditSub.PlayWithNote);
+    AddButton(Theme.EditSub.PlayNote);
+    AddButton(Theme.EditSub.previousseq);
+    AddButton(Theme.EditSub.nextseq);
+    UndoButtonId := AddButton(Theme.EditSub.undo);
+    AddButton(Theme.EditSub.gold);
+    AddButton(Theme.EditSub.freestyle);
+
   // debug
   TextDebug :=  AddText(30, 550, 0, 27, 0, 0, 0, '');
   // in notes place -> for move notes by mouse