diff --git a/sprites-override/blocks/distribution/warp-gate-top.png b/sprites-override/blocks/distribution/warp-gate-top.png
deleted file mode 100644
index 5df45c1..0000000
Binary files a/sprites-override/blocks/distribution/warp-gate-top.png and /dev/null differ
diff --git a/sprites-override/blocks/distribution/warp-gate.png b/sprites-override/blocks/distribution/warp-gate.png
deleted file mode 100644
index ea8387b..0000000
Binary files a/sprites-override/blocks/distribution/warp-gate.png and /dev/null differ
diff --git a/sprites-override/blocks/logic/memory-bank.png b/sprites-override/blocks/logic/memory-bank.png
new file mode 100644
index 0000000..d3599de
Binary files /dev/null and b/sprites-override/blocks/logic/memory-bank.png differ
diff --git a/sprites-override/blocks/storage/container-team-blue.png b/sprites-override/blocks/storage/container-team-blue.png
new file mode 100644
index 0000000..4643862
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-blue.png differ
diff --git a/sprites-override/blocks/storage/container-team-crux.png b/sprites-override/blocks/storage/container-team-crux.png
new file mode 100644
index 0000000..a2b2976
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-crux.png differ
diff --git a/sprites-override/blocks/storage/container-team-derelict.png b/sprites-override/blocks/storage/container-team-derelict.png
new file mode 100644
index 0000000..be68eba
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-derelict.png differ
diff --git a/sprites-override/blocks/storage/container-team-green.png b/sprites-override/blocks/storage/container-team-green.png
new file mode 100644
index 0000000..e489330
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-green.png differ
diff --git a/sprites-override/blocks/storage/container-team-purple.png b/sprites-override/blocks/storage/container-team-purple.png
new file mode 100644
index 0000000..8c4f898
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-purple.png differ
diff --git a/sprites-override/blocks/storage/container-team-sharded.png b/sprites-override/blocks/storage/container-team-sharded.png
new file mode 100644
index 0000000..a5ae881
Binary files /dev/null and b/sprites-override/blocks/storage/container-team-sharded.png differ
diff --git a/sprites-override/blocks/storage/container-team.png b/sprites-override/blocks/storage/container-team.png
new file mode 100644
index 0000000..8a4b5f2
Binary files /dev/null and b/sprites-override/blocks/storage/container-team.png differ
diff --git a/sprites-override/blocks/storage/container.png b/sprites-override/blocks/storage/container.png
index 93e15e3..3e7db5d 100644
Binary files a/sprites-override/blocks/storage/container.png and b/sprites-override/blocks/storage/container.png differ
diff --git a/sprites-override/blocks/storage/from 4.0/core-open.png b/sprites-override/blocks/storage/from 4.0/core-open.png
deleted file mode 100644
index b5f2ea7..0000000
Binary files a/sprites-override/blocks/storage/from 4.0/core-open.png and /dev/null differ
diff --git a/sprites-override/blocks/storage/from 4.0/core-top.png b/sprites-override/blocks/storage/from 4.0/core-top.png
deleted file mode 100644
index 7e471a2..0000000
Binary files a/sprites-override/blocks/storage/from 4.0/core-top.png and /dev/null differ
diff --git a/sprites-override/blocks/storage/from 4.0/core.png b/sprites-override/blocks/storage/from 4.0/core.png
deleted file mode 100644
index 020a663..0000000
Binary files a/sprites-override/blocks/storage/from 4.0/core.png and /dev/null differ
diff --git a/sprites-override/blocks/storage/from 4.0/sortedunloader.png b/sprites-override/blocks/storage/from 4.0/sortedunloader.png
deleted file mode 100644
index 082b4ed..0000000
Binary files a/sprites-override/blocks/storage/from 4.0/sortedunloader.png and /dev/null differ
diff --git a/sprites-override/blocks/storage/vault-team-blue.png b/sprites-override/blocks/storage/vault-team-blue.png
new file mode 100644
index 0000000..5b2d096
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-blue.png differ
diff --git a/sprites-override/blocks/storage/vault-team-crux.png b/sprites-override/blocks/storage/vault-team-crux.png
new file mode 100644
index 0000000..2a4b854
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-crux.png differ
diff --git a/sprites-override/blocks/storage/vault-team-derelict.png b/sprites-override/blocks/storage/vault-team-derelict.png
new file mode 100644
index 0000000..b81244c
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-derelict.png differ
diff --git a/sprites-override/blocks/storage/vault-team-green.png b/sprites-override/blocks/storage/vault-team-green.png
new file mode 100644
index 0000000..a65b3d0
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-green.png differ
diff --git a/sprites-override/blocks/storage/vault-team-purple.png b/sprites-override/blocks/storage/vault-team-purple.png
new file mode 100644
index 0000000..bdd838a
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-purple.png differ
diff --git a/sprites-override/blocks/storage/vault-team-sharded.png b/sprites-override/blocks/storage/vault-team-sharded.png
new file mode 100644
index 0000000..846e317
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team-sharded.png differ
diff --git a/sprites-override/blocks/storage/vault-team.png b/sprites-override/blocks/storage/vault-team.png
new file mode 100644
index 0000000..2fa7086
Binary files /dev/null and b/sprites-override/blocks/storage/vault-team.png differ
diff --git a/sprites-override/blocks/storage/vault.png b/sprites-override/blocks/storage/vault.png
index 4b27c95..bc19255 100644
Binary files a/sprites-override/blocks/storage/vault.png and b/sprites-override/blocks/storage/vault.png differ
diff --git a/sprites-override/blocks/units/additive-reconstructor-top.png b/sprites-override/blocks/units/additive-reconstructor-top.png
new file mode 100644
index 0000000..be27d26
Binary files /dev/null and b/sprites-override/blocks/units/additive-reconstructor-top.png differ
diff --git a/sprites-override/blocks/units/additive-reconstructor.png b/sprites-override/blocks/units/additive-reconstructor.png
new file mode 100644
index 0000000..1462d24
Binary files /dev/null and b/sprites-override/blocks/units/additive-reconstructor.png differ
diff --git a/sprites-override/blocks/units/air-factory.png b/sprites-override/blocks/units/air-factory.png
new file mode 100644
index 0000000..e21555d
Binary files /dev/null and b/sprites-override/blocks/units/air-factory.png differ
diff --git a/sprites-override/blocks/units/command-center-team-blue.png b/sprites-override/blocks/units/command-center-team-blue.png
new file mode 100644
index 0000000..f491142
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-blue.png differ
diff --git a/sprites-override/blocks/units/command-center-team-crux.png b/sprites-override/blocks/units/command-center-team-crux.png
new file mode 100644
index 0000000..ea6fca0
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-crux.png differ
diff --git a/sprites-override/blocks/units/command-center-team-derelict.png b/sprites-override/blocks/units/command-center-team-derelict.png
new file mode 100644
index 0000000..4beae08
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-derelict.png differ
diff --git a/sprites-override/blocks/units/command-center-team-green.png b/sprites-override/blocks/units/command-center-team-green.png
new file mode 100644
index 0000000..79a6291
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-green.png differ
diff --git a/sprites-override/blocks/units/command-center-team-purple.png b/sprites-override/blocks/units/command-center-team-purple.png
new file mode 100644
index 0000000..9f85ef3
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-purple.png differ
diff --git a/sprites-override/blocks/units/command-center-team-sharded.png b/sprites-override/blocks/units/command-center-team-sharded.png
new file mode 100644
index 0000000..5418cc1
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team-sharded.png differ
diff --git a/sprites-override/blocks/units/command-center-team.png b/sprites-override/blocks/units/command-center-team.png
new file mode 100644
index 0000000..d13b718
Binary files /dev/null and b/sprites-override/blocks/units/command-center-team.png differ
diff --git a/sprites-override/blocks/units/command-center.png b/sprites-override/blocks/units/command-center.png
index ff0711c..afc29e6 100644
Binary files a/sprites-override/blocks/units/command-center.png and b/sprites-override/blocks/units/command-center.png differ
diff --git a/sprites-override/blocks/units/crawler-factory-top.png b/sprites-override/blocks/units/crawler-factory-top.png
deleted file mode 100644
index 9f93dd2..0000000
Binary files a/sprites-override/blocks/units/crawler-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/crawler-factory.png b/sprites-override/blocks/units/crawler-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/crawler-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/dagger-factory-top.png b/sprites-override/blocks/units/dagger-factory-top.png
deleted file mode 100644
index bdf9e69..0000000
Binary files a/sprites-override/blocks/units/dagger-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/dagger-factory.png b/sprites-override/blocks/units/dagger-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/dagger-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/draug-factory-top.png b/sprites-override/blocks/units/draug-factory-top.png
deleted file mode 100644
index 8dd3bac..0000000
Binary files a/sprites-override/blocks/units/draug-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/draug-factory.png b/sprites-override/blocks/units/draug-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/draug-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/factory-in-3.png b/sprites-override/blocks/units/factory-in-3.png
new file mode 100644
index 0000000..75c843b
Binary files /dev/null and b/sprites-override/blocks/units/factory-in-3.png differ
diff --git a/sprites-override/blocks/units/factory-out-3.png b/sprites-override/blocks/units/factory-out-3.png
new file mode 100644
index 0000000..8ee26a3
Binary files /dev/null and b/sprites-override/blocks/units/factory-out-3.png differ
diff --git a/sprites-override/blocks/units/factory-top-3.png b/sprites-override/blocks/units/factory-top-3.png
new file mode 100644
index 0000000..cee57ba
Binary files /dev/null and b/sprites-override/blocks/units/factory-top-3.png differ
diff --git a/sprites-override/blocks/units/fortress-factory-top.png b/sprites-override/blocks/units/fortress-factory-top.png
deleted file mode 100644
index 45f7ede..0000000
Binary files a/sprites-override/blocks/units/fortress-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/fortress-factory.png b/sprites-override/blocks/units/fortress-factory.png
deleted file mode 100644
index 633e674..0000000
Binary files a/sprites-override/blocks/units/fortress-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/crawler-factory-top-open.png b/sprites-override/blocks/units/from 4.0/crawler-factory-top-open.png
deleted file mode 100644
index 5f9347c..0000000
Binary files a/sprites-override/blocks/units/from 4.0/crawler-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/dagger-factory-top-open.png b/sprites-override/blocks/units/from 4.0/dagger-factory-top-open.png
deleted file mode 100644
index aa38ced..0000000
Binary files a/sprites-override/blocks/units/from 4.0/dagger-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/draug-factory-top-open.png b/sprites-override/blocks/units/from 4.0/draug-factory-top-open.png
deleted file mode 100644
index d5fd5e7..0000000
Binary files a/sprites-override/blocks/units/from 4.0/draug-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/fortress-factory-top-open.png b/sprites-override/blocks/units/from 4.0/fortress-factory-top-open.png
deleted file mode 100644
index 2509ead..0000000
Binary files a/sprites-override/blocks/units/from 4.0/fortress-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/ghoul-factory-top-open.png b/sprites-override/blocks/units/from 4.0/ghoul-factory-top-open.png
deleted file mode 100644
index 2509ead..0000000
Binary files a/sprites-override/blocks/units/from 4.0/ghoul-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/phantom-factory-top-open.png b/sprites-override/blocks/units/from 4.0/phantom-factory-top-open.png
deleted file mode 100644
index ed4c8a9..0000000
Binary files a/sprites-override/blocks/units/from 4.0/phantom-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/reconstructor-open.png b/sprites-override/blocks/units/from 4.0/reconstructor-open.png
deleted file mode 100644
index a825e2f..0000000
Binary files a/sprites-override/blocks/units/from 4.0/reconstructor-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/reconstructor.png b/sprites-override/blocks/units/from 4.0/reconstructor.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/from 4.0/reconstructor.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/revenant-factory-top-open.png b/sprites-override/blocks/units/from 4.0/revenant-factory-top-open.png
deleted file mode 100644
index 2772f1f..0000000
Binary files a/sprites-override/blocks/units/from 4.0/revenant-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/spirit-factory-top-open.png b/sprites-override/blocks/units/from 4.0/spirit-factory-top-open.png
deleted file mode 100644
index 92926e2..0000000
Binary files a/sprites-override/blocks/units/from 4.0/spirit-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/titan-factory-top-open.png b/sprites-override/blocks/units/from 4.0/titan-factory-top-open.png
deleted file mode 100644
index 2509ead..0000000
Binary files a/sprites-override/blocks/units/from 4.0/titan-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/from 4.0/wraith-factory-top-open.png b/sprites-override/blocks/units/from 4.0/wraith-factory-top-open.png
deleted file mode 100644
index 055de2f..0000000
Binary files a/sprites-override/blocks/units/from 4.0/wraith-factory-top-open.png and /dev/null differ
diff --git a/sprites-override/blocks/units/ghoul-factory-top.png b/sprites-override/blocks/units/ghoul-factory-top.png
deleted file mode 100644
index 45f7ede..0000000
Binary files a/sprites-override/blocks/units/ghoul-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/ghoul-factory.png b/sprites-override/blocks/units/ghoul-factory.png
deleted file mode 100644
index 95f5cf3..0000000
Binary files a/sprites-override/blocks/units/ghoul-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/ground-factory.png b/sprites-override/blocks/units/ground-factory.png
new file mode 100644
index 0000000..b54b369
Binary files /dev/null and b/sprites-override/blocks/units/ground-factory.png differ
diff --git a/sprites-override/blocks/units/naval-factory.png b/sprites-override/blocks/units/naval-factory.png
new file mode 100644
index 0000000..1c19ff6
Binary files /dev/null and b/sprites-override/blocks/units/naval-factory.png differ
diff --git a/sprites-override/blocks/units/phantom-factory-top.png b/sprites-override/blocks/units/phantom-factory-top.png
deleted file mode 100644
index 76febbd..0000000
Binary files a/sprites-override/blocks/units/phantom-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/phantom-factory.png b/sprites-override/blocks/units/phantom-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/phantom-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/rally-point.png b/sprites-override/blocks/units/rally-point.png
index 11ec7fc..7181cf8 100644
Binary files a/sprites-override/blocks/units/rally-point.png and b/sprites-override/blocks/units/rally-point.png differ
diff --git a/sprites-override/blocks/units/repair-point.png b/sprites-override/blocks/units/repair-point.png
index 2dd26e7..492f59b 100644
Binary files a/sprites-override/blocks/units/repair-point.png and b/sprites-override/blocks/units/repair-point.png differ
diff --git a/sprites-override/blocks/units/revenant-factory-top.png b/sprites-override/blocks/units/revenant-factory-top.png
deleted file mode 100644
index c2e55ee..0000000
Binary files a/sprites-override/blocks/units/revenant-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/revenant-factory.png b/sprites-override/blocks/units/revenant-factory.png
deleted file mode 100644
index caeae0f..0000000
Binary files a/sprites-override/blocks/units/revenant-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/spirit-factory-top.png b/sprites-override/blocks/units/spirit-factory-top.png
deleted file mode 100644
index 3f9a810..0000000
Binary files a/sprites-override/blocks/units/spirit-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/spirit-factory.png b/sprites-override/blocks/units/spirit-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/spirit-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/titan-factory-top.png b/sprites-override/blocks/units/titan-factory-top.png
deleted file mode 100644
index 45f7ede..0000000
Binary files a/sprites-override/blocks/units/titan-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/titan-factory.png b/sprites-override/blocks/units/titan-factory.png
deleted file mode 100644
index bbeb7cd..0000000
Binary files a/sprites-override/blocks/units/titan-factory.png and /dev/null differ
diff --git a/sprites-override/blocks/units/wraith-factory-top.png b/sprites-override/blocks/units/wraith-factory-top.png
deleted file mode 100644
index af46bdb..0000000
Binary files a/sprites-override/blocks/units/wraith-factory-top.png and /dev/null differ
diff --git a/sprites-override/blocks/units/wraith-factory.png b/sprites-override/blocks/units/wraith-factory.png
deleted file mode 100644
index 2d32c8e..0000000
Binary files a/sprites-override/blocks/units/wraith-factory.png and /dev/null differ