diff --git a/legacy/ephysics/.gitignore b/legacy/ephysics/.gitignore
index 6ce725f572..18cfac5af4 100644
--- a/legacy/ephysics/.gitignore
+++ b/legacy/ephysics/.gitignore
@@ -35,8 +35,10 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 data/themes/ephysics_test.edj
+data/themes/ephysics_sandbox.edj
 src/bin/ephysics_test
 src/bin/ephysics_logo
+src/bin/ephysics_sandbox
 doc/html/
 doc/latex/
 doc/man/
diff --git a/legacy/ephysics/data/themes/Makefile.am b/legacy/ephysics/data/themes/Makefile.am
index c9075a5c2d..d772309763 100644
--- a/legacy/ephysics/data/themes/Makefile.am
+++ b/legacy/ephysics/data/themes/Makefile.am
@@ -8,9 +8,9 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_s
 
 filesdir = $(datadir)/ephysics/
 
-files_DATA = ephysics_test.edj
+files_DATA = ephysics_test.edj ephysics_sandbox.edj
 
-EXTRA_DIST = \
+TEST_FILES = \
 	ephysics_test.edc \
 	balls.edc \
 	buttons.edc \
@@ -20,7 +20,6 @@ EXTRA_DIST = \
 	frame.edc \
 	list.edc \
 	loading_bar.edc \
-	sandbox.edc \
 	shadows.edc \
 	shapes.edc \
 	spinner.edc \
@@ -33,6 +32,7 @@ EXTRA_DIST = \
 	images/ball-red.png \
 	images/ball-red70.png \
 	images/bg_floor.jpg \
+	images/brown-pole.png \
 	images/bt_jump.png \
 	images/bt_jump_pressed.png \
 	images/bt_restart.png \
@@ -44,6 +44,7 @@ EXTRA_DIST = \
 	images/collisionL.png \
 	images/cube-blue.png \
 	images/cube-purple.png \
+	images/green-flag.png \
 	images/hexagon.png \
 	images/list-item.png \
 	images/list-item-corner.png \
@@ -59,9 +60,13 @@ EXTRA_DIST = \
 	images/spinner_bt_left_pressed.png \
 	images/spinner_bt_right.png \
 	images/spinner_bt_right_pressed.png \
-	images/star.png \
-	images/green-flag.png \
-	images/brown-pole.png \
+	images/star.png
+
+SANDBOX_FILES = \
+	ephysics_sandbox.edc \
+	sandbox_misc.edc \
+	images/background.jpg \
+	images/ball-blue70.png \
 	images/ball-custom.png \
 	images/ball-concrete.png \
 	images/ball-iron.png \
@@ -70,10 +75,19 @@ EXTRA_DIST = \
 	images/ball-rubber.png \
 	images/ball-wood.png
 
-ephysics_test.edj: Makefile $(EXTRA_DIST)
+EXTRA_DIST = \
+    $(TEST_FILES) \
+    $(SANDBOX_FILES)
+
+ephysics_test.edj: Makefile $(TEST_FILES)
 	$(EDJE_CC) $(EDJE_FLAGS) \
 	$(top_srcdir)/data/themes/ephysics_test.edc \
 	$(top_builddir)/data/themes/ephysics_test.edj
 
+ephysics_sandbox.edj: Makefile $(SANDBOX_FILES)
+	$(EDJE_CC) $(EDJE_FLAGS) \
+	$(top_srcdir)/data/themes/ephysics_sandbox.edc \
+	$(top_builddir)/data/themes/ephysics_sandbox.edj
+
 clean-local:
 	rm -f *.edj
diff --git a/legacy/ephysics/data/themes/ephysics_sandbox.edc b/legacy/ephysics/data/themes/ephysics_sandbox.edc
new file mode 100644
index 0000000000..239b5bf823
--- /dev/null
+++ b/legacy/ephysics/data/themes/ephysics_sandbox.edc
@@ -0,0 +1,8 @@
+externals {
+   external: "elm";
+}
+
+collections {
+#include "balls.edc"
+#include "sandbox_misc.edc"
+}
diff --git a/legacy/ephysics/data/themes/ephysics_test.edc b/legacy/ephysics/data/themes/ephysics_test.edc
index 87594cd64b..f0bec3e4ac 100644
--- a/legacy/ephysics/data/themes/ephysics_test.edc
+++ b/legacy/ephysics/data/themes/ephysics_test.edc
@@ -10,7 +10,6 @@ collections {
 #include "frame.edc"
 #include "list.edc"
 #include "loading_bar.edc"
-#include "sandbox.edc"
 #include "shadows.edc"
 #include "shapes.edc"
 #include "spinner.edc"
diff --git a/legacy/ephysics/data/themes/sandbox.edc b/legacy/ephysics/data/themes/sandbox_misc.edc
similarity index 100%
rename from legacy/ephysics/data/themes/sandbox.edc
rename to legacy/ephysics/data/themes/sandbox_misc.edc
diff --git a/legacy/ephysics/src/bin/ephysics_sandbox.c b/legacy/ephysics/src/bin/ephysics_sandbox.c
index a47232f735..78a91dab7a 100644
--- a/legacy/ephysics/src/bin/ephysics_sandbox.c
+++ b/legacy/ephysics/src/bin/ephysics_sandbox.c
@@ -8,7 +8,7 @@
 #include<Elementary.h>
 #include<EPhysics.h>
 
-#define EPHYSICS_TEST_THEME "ephysics_test"
+#define SANDBOX_THEME "ephysics_sandbox"
 #define WIDTH (1280)
 #define HEIGHT (720)
 
@@ -151,7 +151,7 @@ _body_material_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 
    body_image = elm_image_add(evas_object_data_get(obj, "win"));
    elm_image_file_set(
-      body_image, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", img_name);
+      body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", img_name);
    evas_object_resize(body_image, 70, 70);
    evas_object_move(body_image, 150, 150);//FIX!
    evas_object_show(body_image);
@@ -681,7 +681,7 @@ _sandie_body_add(Evas_Object *win, EPhysics_World *world, int x, int y)
 
    body_image = elm_image_add(win);
    elm_image_file_set(
-      body_image, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj", "big-blue-ball");
+      body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", "big-blue-ball");
    evas_object_resize(body_image, 70, 70);
    evas_object_move(body_image, x, y);
    evas_object_show(body_image);
@@ -838,7 +838,7 @@ elm_main()
         return r;
      }
 
-   elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj");
+   elm_theme_extension_add(NULL, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj");
 
    sandie->win = elm_win_add(NULL, "Sandbox", ELM_WIN_BASIC);
 
@@ -851,7 +851,7 @@ elm_main()
    layout = elm_layout_add(sandie->win);
    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(sandie->win, layout);
-   elm_layout_file_set(layout, PACKAGE_DATA_DIR "/" EPHYSICS_TEST_THEME ".edj",
+   elm_layout_file_set(layout, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj",
                        "sandbox");
    evas_object_show(layout);
    evas_object_data_set(sandie->win, "layout", layout);