diff --git a/BGAnimations/flash/default.lua b/BGAnimations/flash/default.lua
index 57d615d067..b249f5e512 100644
--- a/BGAnimations/flash/default.lua
+++ b/BGAnimations/flash/default.lua
@@ -1,5 +1,15 @@
-local flashColor = color(Var "Color1")
-return Def.Quad {
-	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;diffuse,flashColor;);
-	GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
+local flashColor = color(Var "Color1")
+return Def.Quad {
+	InitCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
+		self:diffuse(flashColor);
+	end;
+	GainFocusCommand=function(self)
+		self:finishtweening();
+		self:diffusealpha(1);
+		self:accelerate(0.6);
+		self:diffusealpha(0);
+	end;
 };
\ No newline at end of file
diff --git a/BGAnimations/white flash/default.lua b/BGAnimations/white flash/default.lua
index 6b4bb74a03..1ceaef6c96 100644
--- a/BGAnimations/white flash/default.lua	
+++ b/BGAnimations/white flash/default.lua	
@@ -1,4 +1,13 @@
 return Def.Quad {    
-    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
-    GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
+    InitCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
+	end;
+    GainFocusCommand=function(self)
+		self:finishtweening();
+		self:diffusealpha(1);
+		self:accelerate(0.6);
+		self:diffusealpha(0);
+	end;
 };
\ No newline at end of file
diff --git a/BGAnimations/white reverse flash/default.lua b/BGAnimations/white reverse flash/default.lua
index b3f97a46a2..60965986c8 100644
--- a/BGAnimations/white reverse flash/default.lua	
+++ b/BGAnimations/white reverse flash/default.lua	
@@ -1,4 +1,13 @@
-return Def.Quad {    
-    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
-    GainFocusCommand=cmd(finishtweening;diffusealpha,0;accelerate,0.6;diffusealpha,1);
+return Def.Quad {    
+    InitCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
+	end;
+    GainFocusCommand=function(self)
+		self:finishtweening();
+		self:diffusealpha(0);
+		self:accelerate(0.6);
+		self:diffusealpha(1);
+	end;
 };
\ No newline at end of file
diff --git a/BGAnimations/yellow flash/default.lua b/BGAnimations/yellow flash/default.lua
index 0681c212ce..4f8cffce67 100644
--- a/BGAnimations/yellow flash/default.lua	
+++ b/BGAnimations/yellow flash/default.lua	
@@ -1,4 +1,13 @@
 return Def.Quad {
-    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
-    GainFocusCommand=cmd(finishtweening;diffuse,color("#FFFFA0");accelerate,0.6;diffusealpha,0);
+    InitCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
+	end;
+    GainFocusCommand=function(self)
+		self:finishtweening();
+		self:diffuse(color("#FFFFA0"));
+		self:accelerate(0.6);
+		self:diffusealpha(0);
+	end;
 };
\ No newline at end of file
diff --git a/Docs/steps.lua b/Docs/steps.lua
index 4f8d015e9c..987ce1eef7 100644
--- a/Docs/steps.lua
+++ b/Docs/steps.lua
@@ -42,8 +42,8 @@ local MetaData = {
 				startTime = { path, rate, offset, commands }
 				Any ommitted arguments will default to nil, except for rate, which would use 1.0
 			]]
-			0 = {"path/to/bga", 1.0, 0.000, 0, cmd(rainbow) },
-			0 = {"path/to/bga2", 1.0, 0.000, 0, cmd(thump) }
+			0 = {"path/to/bga", 1.0, 0.000, 0, function(self) self:rainbow(); end; },
+			0 = {"path/to/bga2", 1.0, 0.000, 0, function(self) self:thump(); end; }
 		},
 	},
 	--[[