diff --git a/core/assets-raw/sprites/blocks/shieldgenerator.png b/core/assets-raw/sprites/blocks/shieldgenerator.png
index 52a2da07ea..4da9e9ccf5 100644
Binary files a/core/assets-raw/sprites/blocks/shieldgenerator.png and b/core/assets-raw/sprites/blocks/shieldgenerator.png differ
diff --git a/core/assets-raw/sprites/blocks/titaniumshieldwall.png b/core/assets-raw/sprites/blocks/titaniumshieldwall.png
new file mode 100644
index 0000000000..b33dfe5ff5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/titaniumshieldwall.png differ
diff --git a/core/assets-raw/sprites/blocks/titaniumwall.png b/core/assets-raw/sprites/blocks/titaniumwall.png
index 7b322cd76e..583c63e4a3 100644
Binary files a/core/assets-raw/sprites/blocks/titaniumwall.png and b/core/assets-raw/sprites/blocks/titaniumwall.png differ
diff --git a/core/assets-raw/sprites/circle.png b/core/assets-raw/sprites/circle.png
index 4675e89777..154fd0dd83 100644
Binary files a/core/assets-raw/sprites/circle.png and b/core/assets-raw/sprites/circle.png differ
diff --git a/core/assets-raw/sprites/circle2.png b/core/assets-raw/sprites/circle2.png
index d49a150507..52a2d983f8 100644
Binary files a/core/assets-raw/sprites/circle2.png and b/core/assets-raw/sprites/circle2.png differ
diff --git a/core/assets-raw/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png
similarity index 100%
rename from core/assets-raw/ui/button-down.9.png
rename to core/assets-raw/sprites/ui/button-down.9.png
diff --git a/core/assets-raw/ui/button-gray-over.9.png b/core/assets-raw/sprites/ui/button-gray-over.9.png
similarity index 100%
rename from core/assets-raw/ui/button-gray-over.9.png
rename to core/assets-raw/sprites/ui/button-gray-over.9.png
diff --git a/core/assets-raw/ui/button-gray.9.png b/core/assets-raw/sprites/ui/button-gray.9.png
similarity index 100%
rename from core/assets-raw/ui/button-gray.9.png
rename to core/assets-raw/sprites/ui/button-gray.9.png
diff --git a/core/assets-raw/ui/button-map-down.9.png b/core/assets-raw/sprites/ui/button-map-down.9.png
similarity index 100%
rename from core/assets-raw/ui/button-map-down.9.png
rename to core/assets-raw/sprites/ui/button-map-down.9.png
diff --git a/core/assets-raw/ui/button-map-over.9.png b/core/assets-raw/sprites/ui/button-map-over.9.png
similarity index 100%
rename from core/assets-raw/ui/button-map-over.9.png
rename to core/assets-raw/sprites/ui/button-map-over.9.png
diff --git a/core/assets-raw/ui/button-map.9.png b/core/assets-raw/sprites/ui/button-map.9.png
similarity index 100%
rename from core/assets-raw/ui/button-map.9.png
rename to core/assets-raw/sprites/ui/button-map.9.png
diff --git a/core/assets-raw/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png
similarity index 100%
rename from core/assets-raw/ui/button-over.9.png
rename to core/assets-raw/sprites/ui/button-over.9.png
diff --git a/core/assets-raw/ui/button-select.9.png b/core/assets-raw/sprites/ui/button-select.9.png
similarity index 100%
rename from core/assets-raw/ui/button-select.9.png
rename to core/assets-raw/sprites/ui/button-select.9.png
diff --git a/core/assets-raw/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png
similarity index 100%
rename from core/assets-raw/ui/button.9.png
rename to core/assets-raw/sprites/ui/button.9.png
diff --git a/core/assets-raw/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png
similarity index 100%
rename from core/assets-raw/ui/check-off.png
rename to core/assets-raw/sprites/ui/check-off.png
diff --git a/core/assets-raw/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png
similarity index 100%
rename from core/assets-raw/ui/check-on.png
rename to core/assets-raw/sprites/ui/check-on.png
diff --git a/core/assets-raw/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png
similarity index 100%
rename from core/assets-raw/ui/check-over.png
rename to core/assets-raw/sprites/ui/check-over.png
diff --git a/core/assets-raw/ui/clear.png b/core/assets-raw/sprites/ui/clear.png
similarity index 100%
rename from core/assets-raw/ui/clear.png
rename to core/assets-raw/sprites/ui/clear.png
diff --git a/core/assets-raw/ui/cursor.png b/core/assets-raw/sprites/ui/cursor.png
similarity index 100%
rename from core/assets-raw/ui/cursor.png
rename to core/assets-raw/sprites/ui/cursor.png
diff --git a/core/assets-raw/ui/icon-cancel.png b/core/assets-raw/sprites/ui/icon-cancel.png
similarity index 100%
rename from core/assets-raw/ui/icon-cancel.png
rename to core/assets-raw/sprites/ui/icon-cancel.png
diff --git a/core/assets-raw/ui/icon-check.png b/core/assets-raw/sprites/ui/icon-check.png
similarity index 100%
rename from core/assets-raw/ui/icon-check.png
rename to core/assets-raw/sprites/ui/icon-check.png
diff --git a/core/assets-raw/ui/icon-close-down.png b/core/assets-raw/sprites/ui/icon-close-down.png
similarity index 100%
rename from core/assets-raw/ui/icon-close-down.png
rename to core/assets-raw/sprites/ui/icon-close-down.png
diff --git a/core/assets-raw/ui/icon-close-over.png b/core/assets-raw/sprites/ui/icon-close-over.png
similarity index 100%
rename from core/assets-raw/ui/icon-close-over.png
rename to core/assets-raw/sprites/ui/icon-close-over.png
diff --git a/core/assets-raw/ui/icon-close.png b/core/assets-raw/sprites/ui/icon-close.png
similarity index 100%
rename from core/assets-raw/ui/icon-close.png
rename to core/assets-raw/sprites/ui/icon-close.png
diff --git a/core/assets-raw/ui/icon-cursor.png b/core/assets-raw/sprites/ui/icon-cursor.png
similarity index 100%
rename from core/assets-raw/ui/icon-cursor.png
rename to core/assets-raw/sprites/ui/icon-cursor.png
diff --git a/core/assets-raw/ui/icon-defense.png b/core/assets-raw/sprites/ui/icon-defense.png
similarity index 100%
rename from core/assets-raw/ui/icon-defense.png
rename to core/assets-raw/sprites/ui/icon-defense.png
diff --git a/core/assets-raw/ui/icon-distribution.png b/core/assets-raw/sprites/ui/icon-distribution.png
similarity index 100%
rename from core/assets-raw/ui/icon-distribution.png
rename to core/assets-raw/sprites/ui/icon-distribution.png
diff --git a/core/assets-raw/ui/icon-menu.png b/core/assets-raw/sprites/ui/icon-menu.png
similarity index 100%
rename from core/assets-raw/ui/icon-menu.png
rename to core/assets-raw/sprites/ui/icon-menu.png
diff --git a/core/assets-raw/ui/icon-pause.png b/core/assets-raw/sprites/ui/icon-pause.png
similarity index 100%
rename from core/assets-raw/ui/icon-pause.png
rename to core/assets-raw/sprites/ui/icon-pause.png
diff --git a/core/assets-raw/ui/icon-play.png b/core/assets-raw/sprites/ui/icon-play.png
similarity index 100%
rename from core/assets-raw/ui/icon-play.png
rename to core/assets-raw/sprites/ui/icon-play.png
diff --git a/core/assets-raw/ui/icon-production.png b/core/assets-raw/sprites/ui/icon-production.png
similarity index 100%
rename from core/assets-raw/ui/icon-production.png
rename to core/assets-raw/sprites/ui/icon-production.png
diff --git a/core/assets-raw/ui/icon-rotate-arrow.png b/core/assets-raw/sprites/ui/icon-rotate-arrow.png
similarity index 100%
rename from core/assets-raw/ui/icon-rotate-arrow.png
rename to core/assets-raw/sprites/ui/icon-rotate-arrow.png
diff --git a/core/assets-raw/ui/icon-rotate.png b/core/assets-raw/sprites/ui/icon-rotate.png
similarity index 100%
rename from core/assets-raw/ui/icon-rotate.png
rename to core/assets-raw/sprites/ui/icon-rotate.png
diff --git a/core/assets-raw/ui/icon-settings.png b/core/assets-raw/sprites/ui/icon-settings.png
similarity index 100%
rename from core/assets-raw/ui/icon-settings.png
rename to core/assets-raw/sprites/ui/icon-settings.png
diff --git a/core/assets-raw/ui/icon-touch.png b/core/assets-raw/sprites/ui/icon-touch.png
similarity index 100%
rename from core/assets-raw/ui/icon-touch.png
rename to core/assets-raw/sprites/ui/icon-touch.png
diff --git a/core/assets-raw/ui/logotext-gray.png b/core/assets-raw/sprites/ui/logotext-gray.png
similarity index 100%
rename from core/assets-raw/ui/logotext-gray.png
rename to core/assets-raw/sprites/ui/logotext-gray.png
diff --git a/core/assets-raw/ui/logotext.png b/core/assets-raw/sprites/ui/logotext.png
similarity index 100%
rename from core/assets-raw/ui/logotext.png
rename to core/assets-raw/sprites/ui/logotext.png
diff --git a/core/assets-raw/ui/pane.9.png b/core/assets-raw/sprites/ui/pane.9.png
similarity index 100%
rename from core/assets-raw/ui/pane.9.png
rename to core/assets-raw/sprites/ui/pane.9.png
diff --git a/core/assets-raw/ui/scroll-horizontal.9.png b/core/assets-raw/sprites/ui/scroll-horizontal.9.png
similarity index 100%
rename from core/assets-raw/ui/scroll-horizontal.9.png
rename to core/assets-raw/sprites/ui/scroll-horizontal.9.png
diff --git a/core/assets-raw/ui/scroll-knob-horizontal.9.png b/core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png
similarity index 100%
rename from core/assets-raw/ui/scroll-knob-horizontal.9.png
rename to core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png
diff --git a/core/assets-raw/ui/scroll-knob-vertical.9.png b/core/assets-raw/sprites/ui/scroll-knob-vertical.9.png
similarity index 100%
rename from core/assets-raw/ui/scroll-knob-vertical.9.png
rename to core/assets-raw/sprites/ui/scroll-knob-vertical.9.png
diff --git a/core/assets-raw/ui/scroll.9.png b/core/assets-raw/sprites/ui/scroll.9.png
similarity index 100%
rename from core/assets-raw/ui/scroll.9.png
rename to core/assets-raw/sprites/ui/scroll.9.png
diff --git a/core/assets-raw/ui/selection.png b/core/assets-raw/sprites/ui/selection.png
similarity index 100%
rename from core/assets-raw/ui/selection.png
rename to core/assets-raw/sprites/ui/selection.png
diff --git a/core/assets-raw/ui/separator.png b/core/assets-raw/sprites/ui/separator.png
similarity index 100%
rename from core/assets-raw/ui/separator.png
rename to core/assets-raw/sprites/ui/separator.png
diff --git a/core/assets-raw/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png
similarity index 100%
rename from core/assets-raw/ui/slider-knob-down.png
rename to core/assets-raw/sprites/ui/slider-knob-down.png
diff --git a/core/assets-raw/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png
similarity index 100%
rename from core/assets-raw/ui/slider-knob-over.png
rename to core/assets-raw/sprites/ui/slider-knob-over.png
diff --git a/core/assets-raw/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png
similarity index 100%
rename from core/assets-raw/ui/slider-knob.png
rename to core/assets-raw/sprites/ui/slider-knob.png
diff --git a/core/assets-raw/ui/slider-vertical.png b/core/assets-raw/sprites/ui/slider-vertical.png
similarity index 100%
rename from core/assets-raw/ui/slider-vertical.png
rename to core/assets-raw/sprites/ui/slider-vertical.png
diff --git a/core/assets-raw/ui/slider.png b/core/assets-raw/sprites/ui/slider.png
similarity index 100%
rename from core/assets-raw/ui/slider.png
rename to core/assets-raw/sprites/ui/slider.png
diff --git a/core/assets-raw/ui/slot.9.png b/core/assets-raw/sprites/ui/slot.9.png
similarity index 100%
rename from core/assets-raw/ui/slot.9.png
rename to core/assets-raw/sprites/ui/slot.9.png
diff --git a/core/assets-raw/ui/textfield-over.9.png b/core/assets-raw/sprites/ui/textfield-over.9.png
similarity index 100%
rename from core/assets-raw/ui/textfield-over.9.png
rename to core/assets-raw/sprites/ui/textfield-over.9.png
diff --git a/core/assets-raw/ui/textfield.9.png b/core/assets-raw/sprites/ui/textfield.9.png
similarity index 100%
rename from core/assets-raw/ui/textfield.9.png
rename to core/assets-raw/sprites/ui/textfield.9.png
diff --git a/core/assets-raw/ui/white.png b/core/assets-raw/sprites/ui/white.png
similarity index 100%
rename from core/assets-raw/ui/white.png
rename to core/assets-raw/sprites/ui/white.png
diff --git a/core/assets-raw/ui/window-gray.9.png b/core/assets-raw/sprites/ui/window-gray.9.png
similarity index 100%
rename from core/assets-raw/ui/window-gray.9.png
rename to core/assets-raw/sprites/ui/window-gray.9.png
diff --git a/core/assets-raw/ui/window.9.png b/core/assets-raw/sprites/ui/window.9.png
similarity index 100%
rename from core/assets-raw/ui/window.9.png
rename to core/assets-raw/sprites/ui/window.9.png
diff --git a/core/assets-raw/ui/blank.png b/core/assets-raw/ui/blank.png
deleted file mode 100644
index b2f9501f47..0000000000
Binary files a/core/assets-raw/ui/blank.png and /dev/null differ
diff --git a/core/assets-raw/ui/border-circle-error.png b/core/assets-raw/ui/border-circle-error.png
deleted file mode 100644
index 6aaeb4ecba..0000000000
Binary files a/core/assets-raw/ui/border-circle-error.png and /dev/null differ
diff --git a/core/assets-raw/ui/border-circle.png b/core/assets-raw/ui/border-circle.png
deleted file mode 100644
index 1d9c9bb057..0000000000
Binary files a/core/assets-raw/ui/border-circle.png and /dev/null differ
diff --git a/core/assets-raw/ui/border-dark-blue.9.png b/core/assets-raw/ui/border-dark-blue.9.png
deleted file mode 100644
index 59a7443282..0000000000
Binary files a/core/assets-raw/ui/border-dark-blue.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/border-error.9.png b/core/assets-raw/ui/border-error.9.png
deleted file mode 100644
index 996a663927..0000000000
Binary files a/core/assets-raw/ui/border-error.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/border-white.9.png b/core/assets-raw/ui/border-white.9.png
deleted file mode 100644
index e5d219eef9..0000000000
Binary files a/core/assets-raw/ui/border-white.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/border.9.png b/core/assets-raw/ui/border.9.png
deleted file mode 100644
index 6e0dea69e0..0000000000
Binary files a/core/assets-raw/ui/border.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-blue-down.9.png b/core/assets-raw/ui/button-blue-down.9.png
deleted file mode 100644
index bd14b14179..0000000000
Binary files a/core/assets-raw/ui/button-blue-down.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-blue-over.9.png b/core/assets-raw/ui/button-blue-over.9.png
deleted file mode 100644
index 071dc99259..0000000000
Binary files a/core/assets-raw/ui/button-blue-over.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-blue.9.png b/core/assets-raw/ui/button-blue.9.png
deleted file mode 100644
index 7364829a7a..0000000000
Binary files a/core/assets-raw/ui/button-blue.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-red.9.png b/core/assets-raw/ui/button-red.9.png
deleted file mode 100644
index 1bebf700e4..0000000000
Binary files a/core/assets-raw/ui/button-red.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-window-bg.9.png b/core/assets-raw/ui/button-window-bg.9.png
deleted file mode 100644
index 564a70a904..0000000000
Binary files a/core/assets-raw/ui/button-window-bg.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/button-window-over.9.png b/core/assets-raw/ui/button-window-over.9.png
deleted file mode 100644
index 2e45f28378..0000000000
Binary files a/core/assets-raw/ui/button-window-over.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/color-picker-bar-selector.png b/core/assets-raw/ui/color-picker-bar-selector.png
deleted file mode 100644
index 84e626e0e2..0000000000
Binary files a/core/assets-raw/ui/color-picker-bar-selector.png and /dev/null differ
diff --git a/core/assets-raw/ui/color-picker-cross.png b/core/assets-raw/ui/color-picker-cross.png
deleted file mode 100644
index 70489c4919..0000000000
Binary files a/core/assets-raw/ui/color-picker-cross.png and /dev/null differ
diff --git a/core/assets-raw/ui/color-picker-selector-horizontal.png b/core/assets-raw/ui/color-picker-selector-horizontal.png
deleted file mode 100644
index 8b6025462f..0000000000
Binary files a/core/assets-raw/ui/color-picker-selector-horizontal.png and /dev/null differ
diff --git a/core/assets-raw/ui/color-picker-selector-vertical.png b/core/assets-raw/ui/color-picker-selector-vertical.png
deleted file mode 100644
index c36d51297c..0000000000
Binary files a/core/assets-raw/ui/color-picker-selector-vertical.png and /dev/null differ
diff --git a/core/assets-raw/ui/cursor-normal.png b/core/assets-raw/ui/cursor-normal.png
deleted file mode 100644
index 7724fe99db..0000000000
Binary files a/core/assets-raw/ui/cursor-normal.png and /dev/null differ
diff --git a/core/assets-raw/ui/default-pane-no-border.9.png b/core/assets-raw/ui/default-pane-no-border.9.png
deleted file mode 100644
index d2c3e66a49..0000000000
Binary files a/core/assets-raw/ui/default-pane-no-border.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/default-pane.9.png b/core/assets-raw/ui/default-pane.9.png
deleted file mode 100644
index 6ff8c37650..0000000000
Binary files a/core/assets-raw/ui/default-pane.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/default-select-selection.9.png b/core/assets-raw/ui/default-select-selection.9.png
deleted file mode 100644
index faa20b6bb8..0000000000
Binary files a/core/assets-raw/ui/default-select-selection.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/default-select.9.png b/core/assets-raw/ui/default-select.9.png
deleted file mode 100644
index c837c8313e..0000000000
Binary files a/core/assets-raw/ui/default-select.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/grey.png b/core/assets-raw/ui/grey.png
deleted file mode 100644
index d57b4a1bb5..0000000000
Binary files a/core/assets-raw/ui/grey.png and /dev/null differ
diff --git a/core/assets-raw/ui/list-selection.png b/core/assets-raw/ui/list-selection.png
deleted file mode 100644
index c31c5175b0..0000000000
Binary files a/core/assets-raw/ui/list-selection.png and /dev/null differ
diff --git a/core/assets-raw/ui/menu-bg.png b/core/assets-raw/ui/menu-bg.png
deleted file mode 100644
index d57b4a1bb5..0000000000
Binary files a/core/assets-raw/ui/menu-bg.png and /dev/null differ
diff --git a/core/assets-raw/ui/padded-list-selection.9.png b/core/assets-raw/ui/padded-list-selection.9.png
deleted file mode 100644
index 9e6045b908..0000000000
Binary files a/core/assets-raw/ui/padded-list-selection.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/progressbar-filled-vertical.png b/core/assets-raw/ui/progressbar-filled-vertical.png
deleted file mode 100644
index 6713cc9ea9..0000000000
Binary files a/core/assets-raw/ui/progressbar-filled-vertical.png and /dev/null differ
diff --git a/core/assets-raw/ui/progressbar-filled.png b/core/assets-raw/ui/progressbar-filled.png
deleted file mode 100644
index 50f58e3535..0000000000
Binary files a/core/assets-raw/ui/progressbar-filled.png and /dev/null differ
diff --git a/core/assets-raw/ui/progressbar-vertical.png b/core/assets-raw/ui/progressbar-vertical.png
deleted file mode 100644
index adeec047fe..0000000000
Binary files a/core/assets-raw/ui/progressbar-vertical.png and /dev/null differ
diff --git a/core/assets-raw/ui/progressbar.png b/core/assets-raw/ui/progressbar.png
deleted file mode 100644
index 439795f5d5..0000000000
Binary files a/core/assets-raw/ui/progressbar.png and /dev/null differ
diff --git a/core/assets-raw/ui/radio-off.png b/core/assets-raw/ui/radio-off.png
deleted file mode 100644
index 6b418cf4ea..0000000000
Binary files a/core/assets-raw/ui/radio-off.png and /dev/null differ
diff --git a/core/assets-raw/ui/radio-on.png b/core/assets-raw/ui/radio-on.png
deleted file mode 100644
index 8192c2d22f..0000000000
Binary files a/core/assets-raw/ui/radio-on.png and /dev/null differ
diff --git a/core/assets-raw/ui/select-box-list-bg.png b/core/assets-raw/ui/select-box-list-bg.png
deleted file mode 100644
index 640981b220..0000000000
Binary files a/core/assets-raw/ui/select-box-list-bg.png and /dev/null differ
diff --git a/core/assets-raw/ui/select-down.png b/core/assets-raw/ui/select-down.png
deleted file mode 100644
index 4390d83447..0000000000
Binary files a/core/assets-raw/ui/select-down.png and /dev/null differ
diff --git a/core/assets-raw/ui/select-up.png b/core/assets-raw/ui/select-up.png
deleted file mode 100644
index 67fcb85d76..0000000000
Binary files a/core/assets-raw/ui/select-up.png and /dev/null differ
diff --git a/core/assets-raw/ui/separator-menu.png b/core/assets-raw/ui/separator-menu.png
deleted file mode 100644
index 5c633eb1c7..0000000000
Binary files a/core/assets-raw/ui/separator-menu.png and /dev/null differ
diff --git a/core/assets-raw/ui/slider-knob-disabled.png b/core/assets-raw/ui/slider-knob-disabled.png
deleted file mode 100644
index 7bbf8cabc5..0000000000
Binary files a/core/assets-raw/ui/slider-knob-disabled.png and /dev/null differ
diff --git a/core/assets-raw/ui/splitpane-over.png b/core/assets-raw/ui/splitpane-over.png
deleted file mode 100644
index feaf4d9010..0000000000
Binary files a/core/assets-raw/ui/splitpane-over.png and /dev/null differ
diff --git a/core/assets-raw/ui/splitpane-vertical-over.png b/core/assets-raw/ui/splitpane-vertical-over.png
deleted file mode 100644
index 211cba34aa..0000000000
Binary files a/core/assets-raw/ui/splitpane-vertical-over.png and /dev/null differ
diff --git a/core/assets-raw/ui/splitpane-vertical.png b/core/assets-raw/ui/splitpane-vertical.png
deleted file mode 100644
index 4328d75f8d..0000000000
Binary files a/core/assets-raw/ui/splitpane-vertical.png and /dev/null differ
diff --git a/core/assets-raw/ui/splitpane.png b/core/assets-raw/ui/splitpane.png
deleted file mode 100644
index ff4820d685..0000000000
Binary files a/core/assets-raw/ui/splitpane.png and /dev/null differ
diff --git a/core/assets-raw/ui/sub-menu.png b/core/assets-raw/ui/sub-menu.png
deleted file mode 100644
index 43fe36b6b3..0000000000
Binary files a/core/assets-raw/ui/sub-menu.png and /dev/null differ
diff --git a/core/assets-raw/ui/tooltip-bg.9.png b/core/assets-raw/ui/tooltip-bg.9.png
deleted file mode 100644
index 00ddecbbb2..0000000000
Binary files a/core/assets-raw/ui/tooltip-bg.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/touchpad-knob.png b/core/assets-raw/ui/touchpad-knob.png
deleted file mode 100644
index 48b9c26339..0000000000
Binary files a/core/assets-raw/ui/touchpad-knob.png and /dev/null differ
diff --git a/core/assets-raw/ui/tree-minus.png b/core/assets-raw/ui/tree-minus.png
deleted file mode 100644
index cbfe2436a5..0000000000
Binary files a/core/assets-raw/ui/tree-minus.png and /dev/null differ
diff --git a/core/assets-raw/ui/tree-over.png b/core/assets-raw/ui/tree-over.png
deleted file mode 100644
index 114704cbce..0000000000
Binary files a/core/assets-raw/ui/tree-over.png and /dev/null differ
diff --git a/core/assets-raw/ui/tree-plus.png b/core/assets-raw/ui/tree-plus.png
deleted file mode 100644
index 9aafc6b9c7..0000000000
Binary files a/core/assets-raw/ui/tree-plus.png and /dev/null differ
diff --git a/core/assets-raw/ui/tree-selection.9.png b/core/assets-raw/ui/tree-selection.9.png
deleted file mode 100644
index 9721e9ed9e..0000000000
Binary files a/core/assets-raw/ui/tree-selection.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/window-bg.png b/core/assets-raw/ui/window-bg.png
deleted file mode 100644
index 640981b220..0000000000
Binary files a/core/assets-raw/ui/window-bg.png and /dev/null differ
diff --git a/core/assets-raw/ui/window-border-bg.9.png b/core/assets-raw/ui/window-border-bg.9.png
deleted file mode 100644
index aba4bf1526..0000000000
Binary files a/core/assets-raw/ui/window-border-bg.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/window-noborder.9.png b/core/assets-raw/ui/window-noborder.9.png
deleted file mode 100644
index e73c7cab58..0000000000
Binary files a/core/assets-raw/ui/window-noborder.9.png and /dev/null differ
diff --git a/core/assets-raw/ui/window-resizable.9.png b/core/assets-raw/ui/window-resizable.9.png
deleted file mode 100644
index 59839b9515..0000000000
Binary files a/core/assets-raw/ui/window-resizable.9.png and /dev/null differ
diff --git a/core/assets/shaders/shield.fragment b/core/assets/shaders/shield.fragment
index fe91425fc9..f4443a495c 100644
--- a/core/assets/shaders/shield.fragment
+++ b/core/assets/shaders/shield.fragment
@@ -18,7 +18,7 @@ void main() {
     vec2 T = v_texCoord.xy;
     vec2 coords = (T * u_texsize) + u_offset;
     
-    float si = 1.0 + sin(u_time / 20.0 + (coords.x + coords.y) / 30.0) / 10.0;
+    float si = 1.0 + sin(u_time / 20.0 /*+ (coords.x + coords.y) / 30.0*/) / 8.0;
 	
 	vec4 color = texture2D(u_texture, T) * vec4(si, si, si, 1.0);
 
@@ -41,10 +41,10 @@ void main() {
 	    //coords.x = float(int(coords.x));
 	    if(color.a > 0.1){
 	        if(mod(coords.x + coords.y + sin(coords.x / 5.0) * 3.0 + sin(coords.y / 5.0) * 3.0  + u_time / 4.0, 10.0) < 2.0){
-	            color *= 1.5;
+	            color *= 1.65;
 	        }
 	        
-	        color.a = 0.15;
+	        color.a = 0.18;
 	    }
 	    
 		gl_FragColor = color;
diff --git a/core/assets/sprites/back-web.png b/core/assets/sprites/back-web.png
deleted file mode 100644
index d550bab492..0000000000
Binary files a/core/assets/sprites/back-web.png and /dev/null differ
diff --git a/core/assets/sprites/back.png b/core/assets/sprites/back.png
deleted file mode 100644
index 70a6cf360a..0000000000
Binary files a/core/assets/sprites/back.png and /dev/null differ
diff --git a/core/assets/sprites/background.png b/core/assets/sprites/background.png
deleted file mode 100644
index bfcb5a122f..0000000000
Binary files a/core/assets/sprites/background.png and /dev/null differ
diff --git a/core/assets/sprites/conveyort.png b/core/assets/sprites/conveyort.png
deleted file mode 100644
index c5a360ac40..0000000000
Binary files a/core/assets/sprites/conveyort.png and /dev/null differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index e46cd57561..4117ce31b1 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -6,889 +6,1269 @@ filter: Nearest,Nearest
 repeat: none
 backgrounds/background
   rotate: false
-  xy: 1, 238
+  xy: 1, 241
   size: 356, 270
   orig: 356, 270
   offset: 0, 0
   index: -1
 blank
   rotate: false
-  xy: 1, 1
+  xy: 295, 218
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 blocks/block
   rotate: false
-  xy: 101, 26
+  xy: 412, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coal1
   rotate: false
-  xy: 301, 228
+  xy: 369, 214
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coal2
   rotate: false
-  xy: 359, 382
+  xy: 484, 453
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coal3
   rotate: false
-  xy: 475, 500
+  xy: 416, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coaldrill
   rotate: false
-  xy: 111, 26
+  xy: 383, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coalgenerator
   rotate: false
-  xy: 203, 120
+  xy: 312, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/coalpurifier
   rotate: false
-  xy: 311, 228
+  xy: 316, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/compositewall
   rotate: false
-  xy: 359, 372
+  xy: 316, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conduit
   rotate: false
-  xy: 485, 500
+  xy: 316, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conduitbottom
   rotate: false
-  xy: 121, 26
+  xy: 316, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conduitliquid
   rotate: false
-  xy: 203, 110
+  xy: 316, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conduittop
   rotate: false
-  xy: 321, 228
+  xy: 316, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conveyor
   rotate: false
-  xy: 359, 362
+  xy: 316, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/conveyormove
   rotate: false
-  xy: 495, 500
+  xy: 316, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/core
   rotate: false
-  xy: 131, 26
+  xy: 316, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/cross
   rotate: false
-  xy: 203, 100
+  xy: 316, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/crucible
   rotate: false
-  xy: 331, 228
+  xy: 383, 374
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/deepwater
   rotate: false
-  xy: 359, 352
+  xy: 383, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/dirt1
   rotate: false
-  xy: 141, 26
+  xy: 383, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/dirt2
   rotate: false
-  xy: 203, 90
+  xy: 383, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/dirt3
   rotate: false
-  xy: 341, 228
+  xy: 393, 375
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/dirtblock
   rotate: false
-  xy: 359, 342
+  xy: 393, 365
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/dirtedge
   rotate: false
-  xy: 203, 176
+  xy: 1, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 blocks/doubleturret
   rotate: false
-  xy: 203, 164
+  xy: 302, 209
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/drill
   rotate: false
-  xy: 151, 26
+  xy: 393, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/duriumwall
   rotate: false
-  xy: 203, 80
+  xy: 393, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/flameturret
   rotate: false
-  xy: 265, 226
+  xy: 302, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/grass1
   rotate: false
-  xy: 161, 26
+  xy: 199, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/grass2
   rotate: false
-  xy: 203, 70
+  xy: 209, 32
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/grass3
   rotate: false
-  xy: 359, 322
+  xy: 209, 22
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/grassblock
   rotate: false
-  xy: 171, 26
+  xy: 219, 32
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/grassblock2
   rotate: false
-  xy: 203, 60
+  xy: 219, 22
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/grassedge
   rotate: false
-  xy: 251, 224
+  xy: 43, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 blocks/iron1
   rotate: false
-  xy: 359, 292
+  xy: 229, 12
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/iron2
   rotate: false
-  xy: 359, 282
+  xy: 239, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/iron3
   rotate: false
-  xy: 359, 272
+  xy: 239, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/irondrill
   rotate: false
-  xy: 359, 262
+  xy: 420, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/ironwall
   rotate: false
-  xy: 359, 252
+  xy: 420, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/junction
   rotate: false
-  xy: 359, 242
+  xy: 420, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/laserturret
   rotate: false
-  xy: 359, 416
+  xy: 304, 139
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/liquidrouter
   rotate: false
-  xy: 351, 228
+  xy: 430, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/machineturret
   rotate: false
-  xy: 441, 498
+  xy: 304, 127
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/megarepairturret
   rotate: false
-  xy: 77, 24
+  xy: 304, 115
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/mortarturret
   rotate: false
-  xy: 203, 152
+  xy: 304, 103
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/mossblock
   rotate: false
-  xy: 389, 484
+  xy: 430, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/mossstone
   rotate: false
-  xy: 389, 484
+  xy: 430, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/omnidrill
   rotate: false
-  xy: 409, 484
+  xy: 440, 430
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/plasmaturret
   rotate: false
-  xy: 277, 226
+  xy: 304, 91
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/pump
   rotate: false
-  xy: 429, 486
+  xy: 450, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/repairturret
   rotate: false
-  xy: 359, 404
+  xy: 304, 79
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/rock
   rotate: false
-  xy: 388, 474
+  xy: 460, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/rock2
   rotate: false
-  xy: 398, 474
+  xy: 470, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/rock2shadow
   rotate: false
-  xy: 408, 474
+  xy: 460, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/rockshadow
   rotate: false
-  xy: 418, 474
+  xy: 470, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/router
   rotate: false
-  xy: 375, 464
+  xy: 450, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/shadow
   rotate: false
-  xy: 453, 498
+  xy: 304, 67
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/shieldgenerator
   rotate: false
-  xy: 375, 454
+  xy: 460, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/shotgunturret
   rotate: false
-  xy: 89, 24
+  xy: 304, 55
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/shrub
   rotate: false
-  xy: 385, 464
+  xy: 470, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/shrubshadow
   rotate: false
-  xy: 375, 444
+  xy: 440, 410
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/smelter
   rotate: false
-  xy: 385, 454
+  xy: 450, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/sniperturret
   rotate: false
-  xy: 203, 140
+  xy: 160, 7
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/steelconveyor
   rotate: false
-  xy: 395, 464
+  xy: 460, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/steelconveyormove
   rotate: false
-  xy: 385, 444
+  xy: 470, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/steelwall
   rotate: false
-  xy: 395, 454
+  xy: 496, 467
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stone
   rotate: false
-  xy: 359, 428
+  xy: 57, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 blocks/stone1
   rotate: false
-  xy: 405, 464
+  xy: 252, 40
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stone2
   rotate: false
-  xy: 395, 444
+  xy: 262, 44
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stone3
   rotate: false
-  xy: 405, 454
+  xy: 272, 44
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stoneblock
   rotate: false
-  xy: 415, 464
+  xy: 282, 44
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stoneblock2
   rotate: false
-  xy: 405, 444
+  xy: 292, 44
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stoneblock3
   rotate: false
-  xy: 415, 454
+  xy: 404, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stonedrill
   rotate: false
-  xy: 415, 444
+  xy: 403, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/stoneedge
   rotate: false
-  xy: 427, 496
+  xy: 71, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 blocks/stonewall
   rotate: false
-  xy: 65, 14
+  xy: 403, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titanium1
   rotate: false
-  xy: 75, 14
+  xy: 403, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titanium2
   rotate: false
-  xy: 85, 14
+  xy: 122, 2
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titanium3
   rotate: false
-  xy: 63, 4
+  xy: 132, 2
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titaniumdrill
   rotate: false
-  xy: 73, 4
+  xy: 379, 214
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titaniumpurifier
   rotate: false
-  xy: 83, 4
+  xy: 484, 443
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+blocks/titaniumshieldwall
+  rotate: false
+  xy: 480, 433
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/titaniumwall
   rotate: false
-  xy: 95, 14
+  xy: 480, 423
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/turret
   rotate: false
-  xy: 289, 226
+  xy: 172, 10
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 blocks/water
   rotate: false
-  xy: 105, 16
+  xy: 315, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blocks/wateredge
   rotate: false
-  xy: 49, 6
+  xy: 470, 449
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 blocks/waveturret
   rotate: false
-  xy: 359, 392
+  xy: 184, 10
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 203, 130
+  xy: 359, 214
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 circle
   rotate: false
-  xy: 65, 24
-  size: 10, 10
-  orig: 10, 10
+  xy: 148, 19
+  size: 17, 17
+  orig: 17, 17
   offset: 0, 0
   index: -1
 circle2
   rotate: false
-  xy: 1, 36
-  size: 200, 200
-  orig: 200, 200
+  xy: 1, 38
+  size: 201, 201
+  orig: 201, 201
   offset: 0, 0
   index: -1
 enemies/blastenemy-t1
   rotate: false
-  xy: 1, 20
+  xy: 256, 118
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/blastenemy-t2
   rotate: false
-  xy: 203, 222
+  xy: 388, 385
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/blastenemy-t3
   rotate: false
-  xy: 359, 474
+  xy: 272, 134
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/enemy-t1
   rotate: false
-  xy: 379, 494
+  xy: 315, 225
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/targetenemy-t1
   rotate: false
-  xy: 379, 494
+  xy: 315, 225
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/enemy-t2
   rotate: false
-  xy: 219, 192
+  xy: 15, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 enemies/enemy-t3
   rotate: false
-  xy: 235, 208
+  xy: 29, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 enemies/fastenemy-t1
   rotate: false
-  xy: 1, 4
+  xy: 167, 22
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/fastenemy-t2
   rotate: false
-  xy: 17, 20
+  xy: 256, 102
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/fastenemy-t3
   rotate: false
-  xy: 203, 206
+  xy: 272, 118
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/flamerenemy-t1
   rotate: false
-  xy: 219, 222
+  xy: 331, 225
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/flamerenemy-t2
   rotate: false
-  xy: 359, 458
+  xy: 183, 22
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/flamerenemy-t3
   rotate: false
-  xy: 395, 494
+  xy: 256, 86
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/mortarenemy-t1
   rotate: false
-  xy: 17, 4
+  xy: 272, 70
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/mortarenemy-t2
   rotate: false
-  xy: 33, 20
+  xy: 272, 54
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/mortarenemy-t3
   rotate: false
-  xy: 203, 190
+  xy: 288, 134
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/rapidenemy-t1
   rotate: false
-  xy: 219, 206
+  xy: 288, 118
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/rapidenemy-t2
   rotate: false
-  xy: 235, 222
+  xy: 288, 102
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/rapidenemy-t3
   rotate: false
-  xy: 359, 442
+  xy: 288, 86
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/tankenemy-t1
   rotate: false
-  xy: 411, 494
+  xy: 288, 70
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/tankenemy-t2
   rotate: false
-  xy: 33, 4
+  xy: 288, 54
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 enemies/tankenemy-t3
   rotate: false
-  xy: 49, 20
+  xy: 454, 447
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-coal
   rotate: false
-  xy: 359, 312
+  xy: 229, 32
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-dirium
   rotate: false
-  xy: 181, 26
+  xy: 229, 22
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-iron
   rotate: false
-  xy: 203, 50
+  xy: 239, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-steel
   rotate: false
-  xy: 359, 302
+  xy: 199, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-stone
   rotate: false
-  xy: 191, 26
+  xy: 209, 12
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-titanium
   rotate: false
-  xy: 203, 40
+  xy: 219, 12
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 375, 476
+  xy: 85, 1
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
   index: -1
 laserend
   rotate: false
-  xy: 359, 490
+  xy: 295, 221
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 player
   rotate: false
-  xy: 419, 484
+  xy: 440, 420
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+ui/button
+  rotate: false
+  xy: 230, 50
+  size: 24, 40
+  split: 10, 10, 6, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-down
+  rotate: false
+  xy: 246, 176
+  size: 24, 40
+  split: 10, 10, 6, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-over
+  rotate: false
+  xy: 246, 176
+  size: 24, 40
+  split: 10, 10, 6, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-gray
+  rotate: false
+  xy: 246, 134
+  size: 24, 40
+  split: 10, 10, 10, 8
+  pad: 8, 8, 2, 2
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-gray-over
+  rotate: false
+  xy: 204, 92
+  size: 24, 40
+  split: 10, 10, 10, 8
+  pad: 8, 8, 2, 2
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-map
+  rotate: false
+  xy: 230, 92
+  size: 24, 40
+  split: 10, 10, 5, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-map-down
+  rotate: false
+  xy: 204, 50
+  size: 24, 40
+  split: 10, 10, 5, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-map-over
+  rotate: false
+  xy: 204, 50
+  size: 24, 40
+  split: 10, 10, 5, 10
+  orig: 24, 40
+  offset: 0, 0
+  index: -1
+ui/button-select
+  rotate: false
+  xy: 122, 12
+  size: 24, 24
+  split: 4, 4, 4, 4
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ui/check-off
+  rotate: false
+  xy: 359, 266
+  size: 28, 32
+  orig: 28, 32
+  offset: 0, 0
+  index: -1
+ui/check-on
+  rotate: false
+  xy: 272, 184
+  size: 28, 32
+  orig: 28, 32
+  offset: 0, 0
+  index: -1
+ui/check-over
+  rotate: false
+  xy: 272, 150
+  size: 28, 32
+  orig: 28, 32
+  offset: 0, 0
+  index: -1
+ui/clear
+  rotate: false
+  xy: 347, 229
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/cursor
+  rotate: false
+  xy: 383, 338
+  size: 4, 4
+  orig: 4, 4
+  offset: 0, 0
+  index: -1
+ui/icon-cancel
+  rotate: false
+  xy: 272, 102
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+ui/icon-check
+  rotate: false
+  xy: 256, 70
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+ui/icon-close
+  rotate: false
+  xy: 204, 176
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+ui/icon-close-down
+  rotate: false
+  xy: 454, 471
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+ui/icon-close-over
+  rotate: false
+  xy: 204, 134
+  size: 40, 40
+  orig: 40, 40
+  offset: 0, 0
+  index: -1
+ui/icon-cursor
+  rotate: false
+  xy: 302, 185
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-defense
+  rotate: false
+  xy: 302, 173
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-distribution
+  rotate: false
+  xy: 302, 161
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-menu
+  rotate: false
+  xy: 240, 38
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-pause
+  rotate: false
+  xy: 404, 389
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-play
+  rotate: false
+  xy: 148, 7
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-production
+  rotate: false
+  xy: 359, 224
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-rotate
+  rotate: false
+  xy: 272, 86
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+ui/icon-rotate-arrow
+  rotate: false
+  xy: 256, 54
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+ui/icon-settings
+  rotate: false
+  xy: 371, 224
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/icon-touch
+  rotate: false
+  xy: 347, 217
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+ui/logotext
+  rotate: false
+  xy: 1, 15
+  size: 89, 21
+  orig: 89, 21
+  offset: 0, 0
+  index: -1
+ui/logotext-gray
+  rotate: false
+  xy: 204, 218
+  size: 89, 21
+  orig: 89, 21
+  offset: 0, 0
+  index: -1
+ui/pane
+  rotate: false
+  xy: 359, 300
+  size: 24, 36
+  split: 10, 10, 5, 5
+  orig: 24, 36
+  offset: 0, 0
+  index: -1
+ui/scroll
+  rotate: false
+  xy: 204, 42
+  size: 34, 6
+  split: 4, 4, 2, 2
+  orig: 34, 6
+  offset: 0, 0
+  index: -1
+ui/scroll-horizontal
+  rotate: false
+  xy: 496, 477
+  size: 6, 34
+  split: 2, 2, 0, 34
+  pad: 0, 5, 5, 4
+  orig: 6, 34
+  offset: 0, 0
+  index: -1
+ui/scroll-knob-horizontal
+  rotate: false
+  xy: 412, 411
+  size: 6, 34
+  split: 2, 2, 0, 34
+  pad: 0, 5, 13, 12
+  orig: 6, 34
+  offset: 0, 0
+  index: -1
+ui/scroll-knob-vertical
+  rotate: false
+  xy: 454, 463
+  size: 34, 6
+  split: 12, 12, 2, 2
+  orig: 34, 6
+  offset: 0, 0
+  index: -1
+ui/selection
+  rotate: false
+  xy: 167, 19
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+ui/separator
+  rotate: false
+  xy: 435, 447
+  size: 1, 1
+  orig: 1, 1
+  offset: 0, 0
+  index: -1
+ui/slider
+  rotate: false
+  xy: 196, 12
+  size: 1, 8
+  orig: 1, 8
+  offset: 0, 0
+  index: -1
+ui/slider-knob
+  rotate: false
+  xy: 359, 338
+  size: 22, 44
+  orig: 22, 44
+  offset: 0, 0
+  index: -1
+ui/slider-knob-down
+  rotate: false
+  xy: 388, 401
+  size: 22, 44
+  orig: 22, 44
+  offset: 0, 0
+  index: -1
+ui/slider-knob-over
+  rotate: false
+  xy: 388, 401
+  size: 22, 44
+  orig: 22, 44
+  offset: 0, 0
+  index: -1
+ui/slider-vertical
+  rotate: false
+  xy: 425, 447
+  size: 8, 1
+  orig: 8, 1
+  offset: 0, 0
+  index: -1
+ui/slot
+  rotate: false
+  xy: 359, 447
+  size: 64, 64
+  split: 4, 8, 8, 4
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+ui/textfield
+  rotate: false
+  xy: 92, 8
+  size: 28, 28
+  split: 6, 6, 6, 6
+  orig: 28, 28
+  offset: 0, 0
+  index: -1
+ui/textfield-over
+  rotate: false
+  xy: 359, 236
+  size: 28, 28
+  split: 2, 2, 2, 2
+  orig: 28, 28
+  offset: 0, 0
+  index: -1
+ui/white
+  rotate: false
+  xy: 420, 412
+  size: 3, 3
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+ui/window
+  rotate: false
+  xy: 425, 450
+  size: 27, 61
+  split: 8, 8, 44, 11
+  orig: 27, 61
+  offset: 0, 0
+  index: -1
+ui/window-gray
+  rotate: false
+  xy: 359, 384
+  size: 27, 61
+  split: 5, 4, 52, 4
+  orig: 27, 61
+  offset: 0, 0
+  index: -1
 weapons/blaster
   rotate: false
-  xy: 465, 500
+  xy: 302, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapons/flamer
   rotate: false
-  xy: 359, 332
+  xy: 199, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapons/mortar
   rotate: false
-  xy: 379, 484
+  xy: 430, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapons/multigun
   rotate: false
-  xy: 399, 484
+  xy: 440, 440
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapons/railgun
   rotate: false
-  xy: 378, 474
+  xy: 450, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 weapons/triblaster
   rotate: false
-  xy: 93, 4
+  xy: 480, 413
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 146e6d4f68..491a9ae28e 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/ui/backup/uiskin.atlas b/core/assets/ui/backup/uiskin.atlas
deleted file mode 100644
index df299190ff..0000000000
--- a/core/assets/ui/backup/uiskin.atlas
+++ /dev/null
@@ -1,745 +0,0 @@
-
-uiskin.png
-size: 512,512
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-border
-  rotate: false
-  xy: 90, 65
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-border-circle
-  rotate: false
-  xy: 256, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-border-circle-error
-  rotate: false
-  xy: 285, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-border-dark-blue
-  rotate: false
-  xy: 407, 85
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-border-error
-  rotate: false
-  xy: 130, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-button
-  rotate: false
-  xy: 372, 41
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-blue
-  rotate: false
-  xy: 272, 14
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-down
-  rotate: false
-  xy: 272, 14
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-blue-down
-  rotate: false
-  xy: 222, 14
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-blue-over
-  rotate: false
-  xy: 247, 14
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-over
-  rotate: false
-  xy: 297, 15
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-red
-  rotate: false
-  xy: 322, 15
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-button-window-bg
-  rotate: false
-  xy: 347, 15
-  size: 24, 40
-  split: 10, 10, 10, 8
-  pad: 8, 8, 2, 2
-  orig: 24, 40
-  offset: 0, 0
-  index: -1
-check-off
-  rotate: false
-  xy: 314, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-textfield
-  rotate: false
-  xy: 314, 85
-  size: 28, 28
-  split: 2, 2, 2, 2
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-check
-  rotate: false
-  xy: 314, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-check-on
-  rotate: false
-  xy: 343, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-color-picker-bar-selector
-  rotate: false
-  xy: 496, 85
-  size: 14, 28
-  orig: 14, 28
-  offset: 0, 0
-  index: -1
-color-picker-cross
-  rotate: false
-  xy: 411, 47
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-color-picker-selector-horizontal
-  rotate: false
-  xy: 22, 27
-  size: 6, 1
-  orig: 6, 1
-  offset: 0, 0
-  index: -1
-color-picker-selector-vertical
-  rotate: false
-  xy: 1, 1
-  size: 1, 6
-  orig: 1, 6
-  offset: 0, 0
-  index: -1
-cursor
-  rotate: false
-  xy: 97, 30
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-default
-  rotate: false
-  xy: 1, 279
-  size: 510, 232
-  orig: 512, 256
-  offset: 0, 24
-  index: -1
-default-pane
-  rotate: false
-  xy: 84, 65
-  size: 5, 3
-  split: 1, 1, 1, 1
-  orig: 5, 3
-  offset: 0, 0
-  index: -1
-default-pane-no-border
-  rotate: false
-  xy: 397, 45
-  size: 1, 1
-  split: 0, 0, 0, 0
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-default-select
-  rotate: false
-  xy: 29, 65
-  size: 54, 48
-  split: 8, 32, 0, 48
-  orig: 54, 48
-  offset: 0, 0
-  index: -1
-default-select-selection
-  rotate: false
-  xy: 134, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-font-small
-  rotate: false
-  xy: 1, 114
-  size: 509, 164
-  orig: 512, 256
-  offset: 0, 91
-  index: -1
-grey
-  rotate: false
-  xy: 196, 52
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-menu-bg
-  rotate: false
-  xy: 196, 52
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-icon-arrow-left
-  rotate: false
-  xy: 29, 1
-  size: 36, 28
-  orig: 44, 44
-  offset: 4, 8
-  index: -1
-icon-arrow-right
-  rotate: false
-  xy: 66, 1
-  size: 36, 28
-  orig: 44, 44
-  offset: 4, 8
-  index: -1
-icon-close
-  rotate: false
-  xy: 1, 8
-  size: 20, 20
-  orig: 44, 44
-  offset: 12, 12
-  index: -1
-icon-drive
-  rotate: false
-  xy: 222, 3
-  size: 36, 10
-  orig: 44, 44
-  offset: 4, 18
-  index: -1
-icon-file-audio
-  rotate: false
-  xy: 97, 32
-  size: 28, 36
-  orig: 44, 44
-  offset: 8, 4
-  index: -1
-icon-file-image
-  rotate: false
-  xy: 103, 1
-  size: 26, 30
-  orig: 44, 44
-  offset: 9, 7
-  index: -1
-icon-file-pdf
-  rotate: false
-  xy: 68, 30
-  size: 28, 34
-  orig: 44, 44
-  offset: 8, 5
-  index: -1
-icon-file-text
-  rotate: false
-  xy: 372, 10
-  size: 26, 30
-  orig: 44, 44
-  offset: 9, 7
-  index: -1
-icon-folder
-  rotate: false
-  xy: 372, 89
-  size: 32, 24
-  orig: 44, 44
-  offset: 6, 12
-  index: -1
-icon-folder-new
-  rotate: false
-  xy: 220, 84
-  size: 35, 29
-  orig: 44, 44
-  offset: 5, 7
-  index: -1
-icon-folder-parent
-  rotate: false
-  xy: 405, 89
-  size: 32, 24
-  orig: 44, 44
-  offset: 6, 12
-  index: -1
-icon-folder-star
-  rotate: false
-  xy: 185, 54
-  size: 34, 26
-  orig: 44, 44
-  offset: 5, 9
-  index: -1
-icon-list-settings
-  rotate: false
-  xy: 29, 30
-  size: 38, 34
-  orig: 44, 44
-  offset: 5, 3
-  index: -1
-icon-refresh
-  rotate: false
-  xy: 411, 58
-  size: 26, 30
-  orig: 44, 44
-  offset: 9, 7
-  index: -1
-icon-star
-  rotate: false
-  xy: 220, 55
-  size: 30, 28
-  orig: 44, 44
-  offset: 7, 8
-  index: -1
-icon-star-outline
-  rotate: false
-  xy: 185, 81
-  size: 34, 32
-  orig: 44, 44
-  offset: 5, 6
-  index: -1
-icon-trash
-  rotate: false
-  xy: 438, 54
-  size: 24, 30
-  orig: 44, 44
-  offset: 10, 7
-  index: -1
-list-selection
-  rotate: false
-  xy: 126, 34
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-vis-blue
-  rotate: false
-  xy: 126, 34
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-padded-list-selection
-  rotate: false
-  xy: 185, 52
-  size: 10, 1
-  split: 4, 4, 0, 1
-  orig: 10, 1
-  offset: 0, 0
-  index: -1
-progressbar
-  rotate: false
-  xy: 126, 36
-  size: 1, 32
-  orig: 1, 32
-  offset: 0, 0
-  index: -1
-progressbar-filled
-  rotate: false
-  xy: 399, 14
-  size: 1, 32
-  orig: 1, 32
-  offset: 0, 0
-  index: -1
-progressbar-filled-vertical
-  rotate: false
-  xy: 130, 1
-  size: 32, 1
-  orig: 32, 1
-  offset: 0, 0
-  index: -1
-progressbar-vertical
-  rotate: false
-  xy: 259, 5
-  size: 32, 1
-  orig: 32, 1
-  offset: 0, 0
-  index: -1
-radio-off
-  rotate: false
-  xy: 438, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-radio
-  rotate: false
-  xy: 438, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-radio-on
-  rotate: false
-  xy: 467, 85
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-scroll
-  rotate: false
-  xy: 372, 82
-  size: 34, 6
-  split: 4, 4, 2, 2
-  orig: 34, 6
-  offset: 0, 0
-  index: -1
-scroll-horizontal
-  rotate: false
-  xy: 397, 47
-  size: 6, 34
-  split: 2, 2, 0, 34
-  pad: -1, -1, 5, 4
-  orig: 6, 34
-  offset: 0, 0
-  index: -1
-scroll-knob-horizontal
-  rotate: false
-  xy: 404, 47
-  size: 6, 34
-  split: 2, 2, 0, 34
-  pad: -1, -1, 13, 12
-  orig: 6, 34
-  offset: 0, 0
-  index: -1
-scroll-knob-vertical
-  rotate: false
-  xy: 259, 7
-  size: 34, 6
-  split: 12, 12, 2, 2
-  orig: 34, 6
-  offset: 0, 0
-  index: -1
-select-box-list-bg
-  rotate: false
-  xy: 126, 32
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-window-bg
-  rotate: false
-  xy: 126, 32
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-select-down
-  rotate: false
-  xy: 478, 56
-  size: 14, 8
-  orig: 14, 8
-  offset: 0, 0
-  index: -1
-select-up
-  rotate: false
-  xy: 422, 49
-  size: 14, 8
-  orig: 14, 8
-  offset: 0, 0
-  index: -1
-selection
-  rotate: false
-  xy: 128, 32
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-separator
-  rotate: false
-  xy: 99, 30
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-tree-over
-  rotate: false
-  xy: 99, 30
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-separator-menu
-  rotate: false
-  xy: 101, 30
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-slider
-  rotate: false
-  xy: 128, 43
-  size: 1, 8
-  orig: 1, 8
-  offset: 0, 0
-  index: -1
-slider-knob
-  rotate: false
-  xy: 130, 7
-  size: 22, 44
-  orig: 22, 44
-  offset: 0, 0
-  index: -1
-slider-knob-disabled
-  rotate: false
-  xy: 153, 7
-  size: 22, 44
-  orig: 22, 44
-  offset: 0, 0
-  index: -1
-slider-knob-down
-  rotate: false
-  xy: 176, 7
-  size: 22, 44
-  orig: 22, 44
-  offset: 0, 0
-  index: -1
-slider-knob-over
-  rotate: false
-  xy: 199, 9
-  size: 22, 44
-  orig: 22, 44
-  offset: 0, 0
-  index: -1
-slider-vertical
-  rotate: false
-  xy: 422, 47
-  size: 8, 1
-  orig: 8, 1
-  offset: 0, 0
-  index: -1
-splitpane
-  rotate: false
-  xy: 503, 68
-  size: 8, 1
-  orig: 8, 1
-  offset: 0, 0
-  index: -1
-splitpane-over
-  rotate: false
-  xy: 503, 66
-  size: 8, 1
-  orig: 8, 1
-  offset: 0, 0
-  index: -1
-splitpane-vertical
-  rotate: false
-  xy: 128, 34
-  size: 1, 8
-  orig: 1, 8
-  offset: 0, 0
-  index: -1
-splitpane-vertical-over
-  rotate: false
-  xy: 367, 76
-  size: 1, 8
-  orig: 1, 8
-  offset: 0, 0
-  index: -1
-sub-menu
-  rotate: false
-  xy: 503, 70
-  size: 8, 14
-  orig: 8, 14
-  offset: 0, 0
-  index: -1
-textfield-over
-  rotate: false
-  xy: 251, 55
-  size: 28, 28
-  split: 2, 2, 2, 2
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-check-over
-  rotate: false
-  xy: 251, 55
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-tooltip-bg
-  rotate: false
-  xy: 138, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-touchpad-knob
-  rotate: false
-  xy: 84, 69
-  size: 44, 44
-  orig: 44, 44
-  offset: 0, 0
-  index: -1
-tree-minus
-  rotate: false
-  xy: 414, 36
-  size: 10, 10
-  orig: 16, 16
-  offset: 2, 4
-  index: -1
-tree-plus
-  rotate: false
-  xy: 401, 30
-  size: 12, 16
-  orig: 16, 16
-  offset: 2, 0
-  index: -1
-tree-selection
-  rotate: false
-  xy: 142, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-vis-check-down
-  rotate: false
-  xy: 280, 56
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-check-tick
-  rotate: false
-  xy: 463, 65
-  size: 19, 19
-  orig: 28, 28
-  offset: 5, 4
-  index: -1
-vis-check-tick-disabled
-  rotate: false
-  xy: 483, 65
-  size: 19, 19
-  orig: 28, 28
-  offset: 5, 4
-  index: -1
-vis-radio-down
-  rotate: false
-  xy: 309, 56
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-radio-over
-  rotate: false
-  xy: 338, 56
-  size: 28, 28
-  orig: 28, 28
-  offset: 0, 0
-  index: -1
-vis-radio-tick
-  rotate: false
-  xy: 401, 15
-  size: 14, 14
-  orig: 28, 28
-  offset: 7, 7
-  index: -1
-vis-radio-tick-disabled
-  rotate: false
-  xy: 463, 50
-  size: 14, 14
-  orig: 28, 28
-  offset: 7, 7
-  index: -1
-vis-red
-  rotate: false
-  xy: 397, 43
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0
-  index: -1
-white
-  rotate: false
-  xy: 146, 3
-  size: 3, 3
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-window
-  rotate: false
-  xy: 157, 52
-  size: 27, 61
-  split: 5, 4, 53, 3
-  orig: 27, 61
-  offset: 0, 0
-  index: -1
-window-border-bg
-  rotate: false
-  xy: 150, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-window-noborder
-  rotate: false
-  xy: 129, 52
-  size: 27, 61
-  split: 5, 4, 53, 3
-  orig: 27, 61
-  offset: 0, 0
-  index: -1
-window-resizable
-  rotate: false
-  xy: 1, 29
-  size: 27, 84
-  split: 3, 19, 2, 20
-  pad: 5, 5, 50, 7
-  orig: 27, 84
-  offset: 0, 0
-  index: -1
diff --git a/core/assets/ui/backup/uiskin.png b/core/assets/ui/backup/uiskin.png
deleted file mode 100644
index 37b09447cd..0000000000
Binary files a/core/assets/ui/backup/uiskin.png and /dev/null differ
diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json
index 8bf672d10f..e2779ad367 100644
--- a/core/assets/ui/uiskin.json
+++ b/core/assets/ui/uiskin.json
@@ -25,57 +25,38 @@ io.anuke.ucore.scene.Skin$TintedDrawable: {
 },
 io.anuke.ucore.scene.ui.Button$ButtonStyle: {
 	default: {down: button-down, up: button },
-	blue: {down: button-blue-down, up: button-blue },
 	toggle: {checked: button-down, down: button-down, up: button }
 },
 io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: {
 	default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-down, up: button, transition: 0 },
-	blue: {over: button-blue-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-blue-down, up: button-blue },
 	toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: grey }
 },
 io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: {
 	default: {down: button-down, up: button, over: button-over },
 	static: {up: button },
 	static-down: {up: button-down },
-	blue: {down: button-blue-down, up: button-blue },
 	toggle: {checked: button-down, down: button-down, up: button },
 	togglemap: {checked: button-map-down, down: button-map-down, up: button-map },
 	select: {checked: button-select, up: clear },
-	gray: {down: button-down, up: button-gray, over: button-gray-over, disabled: button},
 	close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button }
 },
 io.anuke.ucore.scene.ui.ImageTextButton$ImageTextButtonStyle: {
 	default: {down: button-down, up: button, over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey },
-	blue: {down: button-blue-down, up: button-blue, over: button-blue-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey },
 	toggle: {checked: button-down, down: button-down, up: button, font: default-font, fontColor: white, over: button-over, disabled: button, disabledFontColor: grey }
 },
 io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: {
-	list: {vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal },
-	default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal }
-},
-io.anuke.ucore.scene.ui.SelectBox$SelectBoxStyle: {
-	default: {background: default-select, scrollStyle: default, listStyle: {font: default-font, selection: padded-list-selection, background: select-box-list-bg}, font: default-font, fontColor: white, disabledFontColor: grey }
-},
-io.anuke.ucore.scene.ui.SplitPane$SplitPaneStyle: {
-	default-vertical: {handle: splitpane-vertical },
-	default-horizontal: {handle: splitpane }
+	default: {vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal }
 },
 io.anuke.ucore.scene.ui.Window$WindowStyle: {
 	default: {titleFont: default-font, background: window, titleFontColor: orange },
-	resizable: {background: window-resizable, titleFont: default-font, titleFontColor: white },
-	noborder: {background: window-noborder, titleFont: default-font, titleFontColor: white },
 	dialog: {stageBackground: dialogDim, titleFont: default-font, background: window, titleFontColor: orange }
 },
 io.anuke.ucore.scene.ui.KeybindDialog$KeybindDialogStyle: {
 	default: {keyColor: red, keyNameColor: white},
 },
-io.anuke.ucore.scene.ui.ProgressBar$ProgressBarStyle: {
-	default-horizontal: {background: progressbar, knob: progressbar-filled, knobBefore: progressbar-filled },
-	default-vertical: {background: progressbar-vertical, knob: progressbar-filled-vertical, knobBefore: progressbar-filled-vertical }
-},
 io.anuke.ucore.scene.ui.Slider$SliderStyle: {
-	default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down, disabledKnob: slider-knob-disabled },
-	default-vertical: {background: slider-vertical, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down, disabledKnob: slider-knob-disabled }
+	default-horizontal: {background: slider, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down},
+	default-vertical: {background: slider-vertical, knob: slider-knob, knobOver: slider-knob-over, knobDown: slider-knob-down}
 },
 io.anuke.ucore.scene.ui.Label$LabelStyle: {
 	default: {font: default-font, fontColor: white },
@@ -84,23 +65,12 @@ io.anuke.ucore.scene.ui.Label$LabelStyle: {
 	menuitem-shortcut: {font: default-font, fontColor: menuitem }
 },
 io.anuke.ucore.scene.ui.TextField$TextFieldStyle: {
-	default: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey },
-	small: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey }
+	default: {font: default-font, fontColor: white, disabledFontColor: grey, selection: selection, background: textfield, cursor: cursor, messageFont: default-font, messageFontColor: grey }
 },
 io.anuke.ucore.scene.ui.CheckBox$CheckBoxStyle: {
-	default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: grey },
-	radio: {checkboxOn: radio-on, checkboxOff: radio-off, font: default-font, fontColor: white, disabledFontColor: grey }
+	default: {checkboxOn: check-on, checkboxOff: check-off, checkboxOver: check-over, font: default-font, fontColor: white, disabledFontColor: grey }
 },
 io.anuke.ucore.scene.ui.List$ListStyle: {
-	default: {fontColorUnselected: white, selection: padded-list-selection, fontColorSelected: white, font: default-font }
-},
-io.anuke.ucore.scene.ui.Touchpad$TouchpadStyle: {
-	default: {background: default-pane, knob: touchpad-knob }
-},
-io.anuke.ucore.scene.ui.Tree$TreeStyle: {
-	default: {minus: tree-minus, plus: tree-plus, selection: tree-selection, over: tree-over }
-},
-io.anuke.ucore.scene.ui.TextTooltip$TextTooltipStyle: {
-	default: {background: default-pane, label: {font: default-font, fontColor: white} }
+	default: {fontColorUnselected: white, fontColorSelected: white, font: default-font }
 }
 }
diff --git a/core/assets/ui/uiskin.png b/core/assets/ui/uiskin.png
deleted file mode 100644
index ec2d7481c7..0000000000
Binary files a/core/assets/ui/uiskin.png and /dev/null differ
diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java
index eed1a099c2..bd2b9e0a75 100644
--- a/core/src/io/anuke/mindustry/Mindustry.java
+++ b/core/src/io/anuke/mindustry/Mindustry.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry;
 
 import java.util.Date;
 
+import com.badlogic.gdx.graphics.profiling.GLProfiler;
 import com.badlogic.gdx.utils.Array;
 
 import io.anuke.mindustry.GameState.State;
@@ -31,6 +32,9 @@ public class Mindustry extends ModuleCore {
 	
 	@Override
 	public void init(){
+		//if(Vars.debug){
+		GLProfiler.enable();
+		//}
 		//always initialize blocks in this order, otherwise there are ID errors
 		Blocks.dirt.getClass();
 		ProductionBlocks.coaldrill.getClass();
diff --git a/core/src/io/anuke/mindustry/Renderer.java b/core/src/io/anuke/mindustry/Renderer.java
index b7beb3507e..da0eab79ba 100644
--- a/core/src/io/anuke/mindustry/Renderer.java
+++ b/core/src/io/anuke/mindustry/Renderer.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.Input.Buttons;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.profiling.GLProfiler;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 
@@ -20,6 +21,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.World;
 import io.anuke.mindustry.world.blocks.Blocks;
 import io.anuke.mindustry.world.blocks.ProductionBlocks;
+import io.anuke.ucore.UCore;
 import io.anuke.ucore.core.*;
 import io.anuke.ucore.entities.DestructibleEntity;
 import io.anuke.ucore.entities.Entities;
@@ -109,6 +111,13 @@ public class Renderer extends RendererModule{
 			}
 
 			drawDefault();
+			
+			if(Vars.debug && Timers.get("profile", 30)){
+				UCore.log("shaders: " + GLProfiler.shaderSwitches, 
+						"calls: " + GLProfiler.drawCalls,
+						"bindings: " + GLProfiler.textureBindings,
+						"vertices: " + GLProfiler.vertexCount.average);
+			}
 
 			camera.position.set(lastx - deltax, lasty - deltay, 0);
 
diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java
index 65541b1424..ae407c1c8c 100644
--- a/core/src/io/anuke/mindustry/UI.java
+++ b/core/src/io/anuke/mindustry/UI.java
@@ -21,6 +21,7 @@ import io.anuke.mindustry.world.Map;
 import io.anuke.ucore.core.*;
 import io.anuke.ucore.function.VisibilityProvider;
 import io.anuke.ucore.modules.SceneModule;
+import io.anuke.ucore.scene.Skin;
 import io.anuke.ucore.scene.actions.Actions;
 import io.anuke.ucore.scene.builders.*;
 import io.anuke.ucore.scene.event.Touchable;
@@ -72,6 +73,10 @@ public class UI extends SceneModule{
 		Colors.put("health", Color.YELLOW);
 	}
 	
+	protected void loadSkin(){
+		skin = new Skin(Gdx.files.internal("ui/uiskin.json"), Core.atlas);
+	}
+	
 	void drawBackground(){
 		int w = (int)screen.x;
 		int h = (int)screen.y;
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index 20b5b16356..4aa0ed4096 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -9,6 +9,7 @@ import com.badlogic.gdx.utils.ObjectMap;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.enemies.Enemy;
 import io.anuke.mindustry.resource.Item;
+import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Blocks;
 import io.anuke.mindustry.world.blocks.ProductionBlocks;
@@ -57,7 +58,10 @@ public class TileEntity extends Entity{
 	}
 	
 	public void collision(Bullet other){
-		health -= other.getDamage();
+		Block block = tile.block();
+		
+		int amount = block.handleDamage(tile, other.getDamage());
+		health -= amount;
 		if(health <= 0) onDeath();
 	}
 	
diff --git a/core/src/io/anuke/mindustry/entities/effect/Shield.java b/core/src/io/anuke/mindustry/entities/effect/Shield.java
index 73fbc13420..0cb4bd7407 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Shield.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Shield.java
@@ -6,6 +6,8 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.types.ShieldBlock;
 import io.anuke.ucore.core.Draw;
 import io.anuke.ucore.core.Graphics;
+import io.anuke.ucore.entities.BulletEntity;
+import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.Entity;
 
 public class Shield extends Entity{
@@ -27,29 +29,39 @@ public class Shield extends Entity{
 	public void update(){
 		if(!(tile.block() instanceof ShieldBlock)){
 			remove();
+			return;
 		}
+		
+		ShieldBlock block = (ShieldBlock)tile.block();
+		
+		Entities.getNearby(x, y, block.shieldRadius * 2 + 10, entity->{
+			if(entity instanceof BulletEntity){
+				BulletEntity bullet = (BulletEntity)entity;
+				
+				float dst =  entity.distanceTo(this);
+				
+				if(Math.abs(dst - block.shieldRadius) < 2){
+					bullet.velocity.scl(-1);
+				}
+			}
+		});
 	}
 	
 	@Override
 	public void draw(){
+		if(!(tile.block() instanceof ShieldBlock)){
+			return;
+		}
+		
+		ShieldBlock block = (ShieldBlock)tile.block();
+		
 		Graphics.surface("shield", false);
 		Draw.color(Color.ROYAL);
 		Draw.thick(2f);
-		Draw.rect("circle2", (int)x + 0.5f, (int)y + 0.5f, 102f, 102f);
+		Draw.rect("circle2", x, y, block.shieldRadius*2, block.shieldRadius*2);
 		Draw.reset();
 		Graphics.surface();
 	}
-	/*
-	@Override
-	public void drawOver(){
-		Graphics.surface("shield", false);
-		Draw.thick(1f);
-		Draw.color(Color.SKY);
-		Draw.circle(x, y, ((Timers.time() + 50f) % 100f) / 2f);
-		Draw.circle(x, y, (Timers.time() % 100f) / 2f);
-		Draw.reset();
-		Graphics.surface();
-	}*/
 	
 	@Override
 	public void added(){
diff --git a/core/src/io/anuke/mindustry/resource/Recipe.java b/core/src/io/anuke/mindustry/resource/Recipe.java
index fff26fc807..cfc43ca4d5 100644
--- a/core/src/io/anuke/mindustry/resource/Recipe.java
+++ b/core/src/io/anuke/mindustry/resource/Recipe.java
@@ -16,6 +16,7 @@ public enum Recipe{
 	titaniumwall(distribution, Blocks.titaniumwall, stack(Item.titanium, 2)),
 	duriumwall(distribution, Blocks.diriumwall, stack(Item.dirium, 2)),
 	compositewall(distribution, Blocks.compositewall, stack(Item.dirium, 2), stack(Item.titanium, 2), stack(Item.steel, 2), stack(Item.iron, 2)),
+	titaniumshieldwall(distribution, Blocks.titaniumshieldwall, stack(Item.titanium, 2)),
 	conveyor(distribution, ProductionBlocks.conveyor, stack(Item.stone, 1)),
 	fastconveyor(distribution, ProductionBlocks.steelconveyor, stack(Item.steel, 1)),
 	router(distribution, ProductionBlocks.router, stack(Item.stone, 2)),
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index f6ff81beb2..4fb0b26b88 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -60,6 +60,10 @@ public class Block{
 	public boolean canReplace(Block other){
 		return false;
 	}
+	
+	public int handleDamage(Tile tile, int amount){
+		return amount;
+	}
 
 	public void handleItem(Tile tile, Item item, Tile source){
 		tile.entity.addItem(item, 1);
diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
index 00dd85622b..9e6265ccc0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
@@ -6,6 +6,7 @@ import io.anuke.mindustry.resource.Liquid;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.types.Floor;
+import io.anuke.mindustry.world.blocks.types.ShieldedWallBlock;
 import io.anuke.mindustry.world.blocks.types.Wall;
 
 public class Blocks{
@@ -123,5 +124,9 @@ public class Blocks{
 	compositewall = new Wall("compositewall"){{
 		health = 270;
 		formalName = "composite wall";
+	}},
+	titaniumshieldwall = new ShieldedWallBlock("titaniumshieldwall"){{
+		health = 150;
+		formalName = "shielded wall";
 	}};
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
index 215381a111..8ab9c2d30e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
@@ -14,11 +14,16 @@ public class ProductionBlocks{
 	
 	core = new Block("core"){
 		{
-			health = Vars.debug ? 999999999 : 300;
+			health = 300;
 			solid = true;
 			update = true;
 		}
 		
+		@Override
+		public int handleDamage(Tile tile, int amount){
+			return Vars.debug ? 0 : amount;
+		}
+		
 		@Override
 		public void handleItem(Tile tile, Item item, Tile source){
 			Vars.control.addItem(item, 1);
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/Generator.java b/core/src/io/anuke/mindustry/world/blocks/types/Generator.java
index cddb213e16..ea7d45d7de 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/Generator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/Generator.java
@@ -11,7 +11,7 @@ public class Generator extends PowerBlock{
 	public static final int powerTime = 8;
 	
 	public int powerRange = 6;
-	public float powerSpeed = 1f;
+	public float powerSpeed = 0.15f;
 
 	public Generator(String name) {
 		super(name);
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/ShieldBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/ShieldBlock.java
index b629b58533..3a61c1dd19 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/ShieldBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/ShieldBlock.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.types;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.effect.Shield;
 import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.core.Timers;
 
 public class ShieldBlock extends PowerBlock{
 	public float shieldRadius = 40f;
@@ -11,36 +12,34 @@ public class ShieldBlock extends PowerBlock{
 	public ShieldBlock(String name) {
 		super(name);
 	}
-	
+
 	@Override
 	public void update(Tile tile){
 		ShieldEntity entity = tile.entity();
-		
+
 		if(entity.shield == null){
 			entity.shield = new Shield(tile);
-			entity.shield.add();
 		}
-		
-		/*
+
 		if(entity.power > powerDrain * Timers.delta()){
 			if(!entity.shield.active){
 				entity.shield.add();
 			}
-			
+
 			entity.power -= powerDrain * Timers.delta();
 		}else{
 			if(entity.shield.active){
 				entity.shield.remove();
 			}
 		}
-		*/
+
 	}
-	
+
 	@Override
 	public TileEntity getEntity(){
 		return new ShieldEntity();
 	}
-	
+
 	static class ShieldEntity extends PowerEntity{
 		Shield shield;
 	}
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/ShieldedWallBlock.java b/core/src/io/anuke/mindustry/world/blocks/types/ShieldedWallBlock.java
new file mode 100644
index 0000000000..67f694e0ad
--- /dev/null
+++ b/core/src/io/anuke/mindustry/world/blocks/types/ShieldedWallBlock.java
@@ -0,0 +1,70 @@
+package io.anuke.mindustry.world.blocks.types;
+
+import com.badlogic.gdx.graphics.Color;
+
+import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.entities.TileEntity;
+import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.core.Draw;
+import io.anuke.ucore.core.Graphics;
+import io.anuke.ucore.core.Timers;
+
+public class ShieldedWallBlock extends PowerBlock{
+	static final float hitTime = 18f;
+	static final Color hitColor = Color.SKY.cpy().mul(1.2f);
+	public float powerToDamage = 0.1f;
+
+	public ShieldedWallBlock(String name) {
+		super(name);
+	}
+	
+	@Override
+	public int handleDamage(Tile tile, int amount){
+		float drain = amount * powerToDamage;
+		ShieldedWallEntity entity = tile.entity();
+		
+		if(entity.power > drain){
+			entity.power -= drain;
+			entity.hit = hitTime;
+			return 0;
+		}else if(entity.power > 0){
+			int reduction = (int)(entity.power / powerToDamage);
+			entity.power = 0;
+			
+			return amount - reduction;
+		}
+		
+		return amount;
+	}
+	
+	@Override
+	public void draw(Tile tile){
+		super.draw(tile);
+		
+		ShieldedWallEntity entity = tile.entity();
+		
+		if(entity.power > powerToDamage){
+			Graphics.surface("shield", false);
+			Draw.color(Color.ROYAL);
+			Draw.rect("blank", tile.worldx(), tile.worldy(), Vars.tilesize, Vars.tilesize);
+			Graphics.surface();
+		}
+		
+		Draw.color(hitColor);
+		Draw.alpha(entity.hit / hitTime * 0.9f);
+		Draw.rect("blank", tile.worldx(), tile.worldy(), Vars.tilesize, Vars.tilesize);
+		Draw.reset();
+		
+		entity.hit -= Timers.delta();
+		entity.hit = Math.max(entity.hit, 0);
+	}
+	
+	@Override
+	public TileEntity getEntity(){
+		return new ShieldedWallEntity();
+	}
+	
+	static class ShieldedWallEntity extends PowerEntity{
+		public float hit;
+	}
+}