diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744ddf44..88149916095d 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
 $(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
 	sg30.sdv \
 	sg30.thm \
-	arrows.sdg \
-	arrows.sdv \
-	arrows.thm \
-	bpmn.sdg \
-	bpmn.sdv \
-	bpmn.thm \
-	flowchart.sdg \
-	flowchart.sdv \
-	flowchart.thm \
-	icons.sdg \
-	icons.sdv \
-	icons.thm \
-	shapes.sdg \
-	shapes.sdv \
-	shapes.thm \
-	network.sdg \
-	network.sdv \
-	network.thm \
-	diagrams.sdg \
-	diagrams.sdv \
-	diagrams.thm \
 ))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f499213afd1..c17099ce7050 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
 $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
 $(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
-	sg1.sdg \
-	sg1.sdv \
-	sg1.thm \
-	sg4.sdg \
-	sg4.sdv \
-	sg4.thm \
-	sg24.sdg \
-	sg24.sdv \
-	sg24.thm \
-	sg36.sdg \
-	sg36.sdv \
-	sg36.thm \
+	arrows.sdg \
+	arrows.sdv \
+	arrows.thm \
+	bpmn.sdg \
+	bpmn.sdv \
+	bpmn.thm \
+	bullets.sdg \
+	bullets.sdv \
+	bullets.thm \
+	diagrams.sdg \
+	diagrams.sdv \
+	diagrams.thm \
+	flowchart.sdg \
+	flowchart.sdv \
+	flowchart.thm \
+	fontwork.sdg \
+	fontwork.sdv \
+	fontwork.thm \
+	icons.sdg \
+	icons.sdv \
+	icons.thm \
+	network.sdg \
+	network.sdv \
+	network.thm \
+	shapes.sdg \
+	shapes.sdv \
+	shapes.thm \
+	symbolshapes.sdg \
+	symbolshapes.sdv \
+	symbolshapes.thm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
diff --git a/extras/source/gallery/gallery_system/sg1.sdg b/extras/source/gallery/gallery_system/bullets.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdg
rename to extras/source/gallery/gallery_system/bullets.sdg
diff --git a/extras/source/gallery/gallery_system/sg1.sdv b/extras/source/gallery/gallery_system/bullets.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdv
rename to extras/source/gallery/gallery_system/bullets.sdv
diff --git a/extras/source/gallery/gallery_system/sg1.thm b/extras/source/gallery/gallery_system/bullets.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.thm
rename to extras/source/gallery/gallery_system/bullets.thm
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdg b/extras/source/gallery/gallery_system/diagrams.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.sdg
rename to extras/source/gallery/gallery_system/diagrams.sdg
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.sdv b/extras/source/gallery/gallery_system/diagrams.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.sdv
rename to extras/source/gallery/gallery_system/diagrams.sdv
diff --git a/extras/source/gallery/gallery_mytheme/diagrams.thm b/extras/source/gallery/gallery_system/diagrams.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/diagrams.thm
rename to extras/source/gallery/gallery_system/diagrams.thm
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdg b/extras/source/gallery/gallery_system/flowchart.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.sdg
rename to extras/source/gallery/gallery_system/flowchart.sdg
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.sdv b/extras/source/gallery/gallery_system/flowchart.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.sdv
rename to extras/source/gallery/gallery_system/flowchart.sdv
diff --git a/extras/source/gallery/gallery_mytheme/flowchart.thm b/extras/source/gallery/gallery_system/flowchart.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/flowchart.thm
rename to extras/source/gallery/gallery_system/flowchart.thm
diff --git a/extras/source/gallery/gallery_system/sg36.sdg b/extras/source/gallery/gallery_system/fontwork.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.sdg
rename to extras/source/gallery/gallery_system/fontwork.sdg
diff --git a/extras/source/gallery/gallery_system/sg36.sdv b/extras/source/gallery/gallery_system/fontwork.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.sdv
rename to extras/source/gallery/gallery_system/fontwork.sdv
diff --git a/extras/source/gallery/gallery_system/sg36.thm b/extras/source/gallery/gallery_system/fontwork.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg36.thm
rename to extras/source/gallery/gallery_system/fontwork.thm
diff --git a/extras/source/gallery/gallery_mytheme/icons.sdg b/extras/source/gallery/gallery_system/icons.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.sdg
rename to extras/source/gallery/gallery_system/icons.sdg
diff --git a/extras/source/gallery/gallery_mytheme/icons.sdv b/extras/source/gallery/gallery_system/icons.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.sdv
rename to extras/source/gallery/gallery_system/icons.sdv
diff --git a/extras/source/gallery/gallery_mytheme/icons.thm b/extras/source/gallery/gallery_system/icons.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/icons.thm
rename to extras/source/gallery/gallery_system/icons.thm
diff --git a/extras/source/gallery/gallery_mytheme/network.sdg b/extras/source/gallery/gallery_system/network.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.sdg
rename to extras/source/gallery/gallery_system/network.sdg
diff --git a/extras/source/gallery/gallery_mytheme/network.sdv b/extras/source/gallery/gallery_system/network.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.sdv
rename to extras/source/gallery/gallery_system/network.sdv
diff --git a/extras/source/gallery/gallery_mytheme/network.thm b/extras/source/gallery/gallery_system/network.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/network.thm
rename to extras/source/gallery/gallery_system/network.thm
diff --git a/extras/source/gallery/gallery_system/sg3.sdg b/extras/source/gallery/gallery_system/sg3.sdg
deleted file mode 100644
index 269e57253137..000000000000
Binary files a/extras/source/gallery/gallery_system/sg3.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg3.sdv b/extras/source/gallery/gallery_system/sg3.sdv
deleted file mode 100644
index 444959152744..000000000000
Binary files a/extras/source/gallery/gallery_system/sg3.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg3.thm b/extras/source/gallery/gallery_system/sg3.thm
deleted file mode 100644
index b81238c16477..000000000000
Binary files a/extras/source/gallery/gallery_system/sg3.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg4.sdg b/extras/source/gallery/gallery_system/sg4.sdg
deleted file mode 100644
index da114195d5e9..000000000000
Binary files a/extras/source/gallery/gallery_system/sg4.sdg and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg4.sdv b/extras/source/gallery/gallery_system/sg4.sdv
deleted file mode 100644
index fc17dd9d0528..000000000000
Binary files a/extras/source/gallery/gallery_system/sg4.sdv and /dev/null differ
diff --git a/extras/source/gallery/gallery_system/sg4.thm b/extras/source/gallery/gallery_system/sg4.thm
deleted file mode 100644
index 91b9ba32df7e..000000000000
Binary files a/extras/source/gallery/gallery_system/sg4.thm and /dev/null differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdg b/extras/source/gallery/gallery_system/shapes.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.sdg
rename to extras/source/gallery/gallery_system/shapes.sdg
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdv b/extras/source/gallery/gallery_system/shapes.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.sdv
rename to extras/source/gallery/gallery_system/shapes.sdv
diff --git a/extras/source/gallery/gallery_mytheme/shapes.thm b/extras/source/gallery/gallery_system/shapes.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/shapes.thm
rename to extras/source/gallery/gallery_system/shapes.thm
diff --git a/extras/source/gallery/gallery_system/sg24.sdg b/extras/source/gallery/gallery_system/symbolshapes.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.sdg
rename to extras/source/gallery/gallery_system/symbolshapes.sdg
diff --git a/extras/source/gallery/gallery_system/sg24.sdv b/extras/source/gallery/gallery_system/symbolshapes.sdv
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.sdv
rename to extras/source/gallery/gallery_system/symbolshapes.sdv
diff --git a/extras/source/gallery/gallery_system/sg24.thm b/extras/source/gallery/gallery_system/symbolshapes.thm
similarity index 100%
rename from extras/source/gallery/gallery_system/sg24.thm
rename to extras/source/gallery/gallery_system/symbolshapes.thm
diff --git a/extras/source/gallery/share/gallery_names.ulf b/extras/source/gallery/share/gallery_names.ulf
index 0d1da8dbec8a..f013ce7b351f 100644
--- a/extras/source/gallery/share/gallery_names.ulf
+++ b/extras/source/gallery/share/gallery_names.ulf
@@ -13,34 +13,25 @@ en-US = "Arrows"
 [backgrounds]
 en-US = "Backgrounds"
 
-[computers]
-en-US = "Computers"
+[bpmn]
+en-US = "BPMN"
 
 [diagrams]
 en-US = "Diagrams"
 
-[education]
-en-US = "School & University"
+[flowchart]
+en-US = "Flow chart"
 
-[environment]
-en-US = "Environment"
+[icons]
+en-US = "Icons"
 
-[finance]
-en-US = "Finance"
+[network]
+en-US = "Network"
 
-[people]
-en-US = "People"
+[shapes]
+en-US = "Shapes"
 
 [sounds]
 en-US = "Sounds"
 
-[symbols]
-en-US = "Symbols"
-
-[txtshapes]
-en-US = "Text Shapes"
-
-[transportation]
-en-US = "Transportation"
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */