diff --git a/reference/AnimatedClip/AnimatedClip.lay b/reference/AnimatedClip/AnimatedClip.lay
index f8ccc41d1..f9a1c3cb8 100644
--- a/reference/AnimatedClip/AnimatedClip.lay
+++ b/reference/AnimatedClip/AnimatedClip.lay
@@ -1,18 +1,18 @@
-LAYOUT(AnimatedClipLayout, 540, 280)
-	ITEM(RasterPlayer, clip, SetFrame(InsetFrame()).HSizePosZ(8, 8).VSizePosZ(92, 32))
-	ITEM(Label, openedPage, SetLabel(t_("0")).LeftPosZ(204, 24).TopPosZ(68, 19))
-	ITEM(Label, dv___2, SetLabel(t_("Opened Page:")).LeftPosZ(132, 68).TopPosZ(68, 19))
-	ITEM(Label, numberPages, SetLabel(t_("1")).LeftPosZ(100, 24).TopPosZ(68, 19))
-	ITEM(Label, dv___4, SetLabel(t_("Number of Pages:")).LeftPosZ(8, 88).TopPosZ(68, 19))
-	ITEM(EditString, fileName, HSizePosZ(68, 232).TopPosZ(40, 19))
-	ITEM(Button, openNext, SetLabel(t_("Open Next")).RightPosZ(164, 64).TopPosZ(68, 20))
-	ITEM(Button, stop, SetLabel(t_("Stop")).RightPosZ(232, 36).TopPosZ(68, 20))
-	ITEM(Button, play, SetLabel(t_("Play")).RightPosZ(272, 36).TopPosZ(68, 20))
-	ITEM(Button, browse, SetLabel(t_("Browse")).RightPosZ(164, 64).TopPosZ(40, 20))
-	ITEM(Label, dv___10, SetLabel(t_("Load and animate GIF and TIFF files")).HSizePosZ(8, 84).TopPosZ(8, 19))
-	ITEM(Label, dv___11, SetLabel(t_("Image file:")).LeftPosZ(8, 56).TopPosZ(40, 19))
-	ITEM(RasterPlayer, earth, RightPosZ(12, 52).TopPosZ(8, 52))
-	ITEM(RasterPlayer, arrows, SetSpeed(2).HSizePosZ(8, 8).BottomPosZ(8, 20))
-	ITEM(Switch, numThreads, SetLabel(t_("Single thread\nMultithreaded")).RightPosZ(68, 88).VSizePosZ(56, 192))
+LAYOUT(AnimatedClipLayout, 536, 280)
+	ITEM(Upp::RasterPlayer, clip, SetFrame(InsetFrame()).HSizePosZ(8, 8).VSizePosZ(92, 32))
+	ITEM(Upp::Label, openedPage, SetLabel(t_("0")).LeftPosZ(204, 24).TopPosZ(68, 19))
+	ITEM(Upp::Label, dv___2, SetLabel(t_("Opened Page:")).LeftPosZ(132, 68).TopPosZ(68, 19))
+	ITEM(Upp::Label, numberPages, SetLabel(t_("1")).LeftPosZ(100, 24).TopPosZ(68, 19))
+	ITEM(Upp::Label, dv___4, SetLabel(t_("Number of Pages:")).LeftPosZ(8, 88).TopPosZ(68, 19))
+	ITEM(Upp::EditString, fileName, HSizePosZ(68, 232).TopPosZ(40, 19))
+	ITEM(Upp::Button, openNext, SetLabel(t_("Open Next")).RightPosZ(164, 64).TopPosZ(68, 20))
+	ITEM(Upp::Button, stop, SetLabel(t_("Stop")).RightPosZ(232, 36).TopPosZ(68, 20))
+	ITEM(Upp::Button, play, SetLabel(t_("Play")).RightPosZ(272, 36).TopPosZ(68, 20))
+	ITEM(Upp::Button, browse, SetLabel(t_("Browse")).RightPosZ(164, 64).TopPosZ(40, 20))
+	ITEM(Upp::Label, dv___10, SetLabel(t_("Load and animate GIF and TIFF files")).HSizePosZ(8, 84).TopPosZ(8, 19))
+	ITEM(Upp::Label, dv___11, SetLabel(t_("Image file:")).LeftPosZ(8, 56).TopPosZ(40, 19))
+	ITEM(Upp::RasterPlayer, earth, RightPosZ(12, 52).TopPosZ(8, 52))
+	ITEM(Upp::RasterPlayer, arrows, SetSpeed(2).HSizePosZ(8, 8).BottomPosZ(8, 20))
+	ITEM(Upp::Switch, numThreads, SetLabel(t_("Single thread\nMultithreaded")).RightPosZ(68, 88).VSizePosZ(56, 192))
 END_LAYOUT
 
diff --git a/reference/AnimatedClip/AnimatedClip.upp b/reference/AnimatedClip/AnimatedClip.upp
index 5f39cd0e3..9e5d2d443 100644
--- a/reference/AnimatedClip/AnimatedClip.upp
+++ b/reference/AnimatedClip/AnimatedClip.upp
@@ -7,8 +7,8 @@ uses
 	RasterPlayer;
 
 file
-	AnimatedClip.h,
 	main.cpp,
+	AnimatedClip.h,
 	AnimatedClip.lay,
 	AnimatedClip.brc,
 	arkearth_e0.gif,