diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang
index 5c772e86e..6431b6a43 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang
+++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang
@@ -263,10 +263,10 @@ gui.tooltips.appliedenergistics2.SubstitutionsOff=Substitutions Disabled
 gui.tooltips.appliedenergistics2.Encode=Encode Pattern
 gui.tooltips.appliedenergistics2.EncodeDescription=Write the entered pattern to the current encoded pattern, or to available blank pattern. Hold Shift to transfer directly to your inventory
 gui.tooltips.appliedenergistics2.FuzzyMode=Fuzzy Comparison
-gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at 25%
-gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at 50%
-gui.tooltips.appliedenergistics2.FZPercent_75=Split Damage at 75%
-gui.tooltips.appliedenergistics2.FZPercent_99=Split Damage at 99%
+gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at §a25%§r
+gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at §e50%§r
+gui.tooltips.appliedenergistics2.FZPercent_75=Split Damage at §675%§r
+gui.tooltips.appliedenergistics2.FZPercent_99=Split Damage at §499%§r
 gui.tooltips.appliedenergistics2.SortOrder=Sort Order
 gui.tooltips.appliedenergistics2.SortBy=Sort By
 gui.tooltips.appliedenergistics2.FZIgnoreAll=Match Any
@@ -290,8 +290,8 @@ gui.tooltips.appliedenergistics2.TrashController=Deletion via Shift / Space Clic
 gui.tooltips.appliedenergistics2.InterfaceBlockingMode=Blocking Mode
 gui.tooltips.appliedenergistics2.InterfaceCraftingMode=Crafting Mode
 gui.tooltips.appliedenergistics2.Trash=Destroy Items
-gui.tooltips.appliedenergistics2.MatterBalls=Condense Into Matter Balls\n%s per item
-gui.tooltips.appliedenergistics2.Singularity=Condense Into Singularities\n%s per item
+gui.tooltips.appliedenergistics2.MatterBalls=Condense Into Matter Balls\n§a%s§r per item
+gui.tooltips.appliedenergistics2.Singularity=Condense Into Singularities\n§a%s§r per item
 gui.tooltips.appliedenergistics2.Read=Extract Only
 gui.tooltips.appliedenergistics2.Write=Insert Only
 gui.tooltips.appliedenergistics2.ReadWrite=Bi-Directional
@@ -410,16 +410,16 @@ waila.appliedenergistics2.Locked=Locked
 waila.appliedenergistics2.Unlocked=Unlocked
 waila.appliedenergistics2.Showing=Showing
 waila.appliedenergistics2.Contains=Contains
-waila.appliedenergistics2.Channels=%1$d of %2$d Channels
+waila.appliedenergistics2.Channels=§2%1$d§r of §4%2$d§r Channels
 waila.appliedenergistics2.P2PUnlinked=Unlinked
 waila.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
-waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
+waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - §4%d§r Outputs
 waila.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
+waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - §2%d§r Inputs
 waila.appliedenergistics2.P2POutput=Linked (Output Side)
 
 // TheOneProbe
-theoneprobe.appliedenergistics2.crafting=Crafting: %1$s
+theoneprobe.appliedenergistics2.crafting=Crafting: §2%1$s§r
 theoneprobe.appliedenergistics2.device_online=Device Online
 theoneprobe.appliedenergistics2.device_offline=Device Offline
 theoneprobe.appliedenergistics2.device_missing_channel=Device Missing Channel
@@ -427,15 +427,15 @@ theoneprobe.appliedenergistics2.locked=Locked
 theoneprobe.appliedenergistics2.unlocked=Unlocked
 theoneprobe.appliedenergistics2.showing=Showing
 theoneprobe.appliedenergistics2.contains=Contains
-theoneprobe.appliedenergistics2.channels=%1$d of %2$d Channels
+theoneprobe.appliedenergistics2.channels=§2%1$d§r of §4%2$d§r Channels
 theoneprobe.appliedenergistics2.p2p_unlinked=Unlinked
 theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output
-theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs
+theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - §4%d§r Outputs
 theoneprobe.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input
-theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs
+theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - §2%d§r Inputs
 theoneprobe.appliedenergistics2.p2p_output=Linked (Output Side)
-theoneprobe.appliedenergistics2.p2p_frequency=Frequency: %1$s
-theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d
+theoneprobe.appliedenergistics2.p2p_frequency=Frequency: §5%1$s§r
+theoneprobe.appliedenergistics2.stored_energy=§2%1$d§к / §4%2$d§r
 
 // Items
 item.appliedenergistics2.storage_cell_1k.name=§61k§r ME Storage Cell
diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang
index ec06debe0..c9a91514c 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang
+++ b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang
@@ -2,23 +2,23 @@
 tile.appliedenergistics2.cable_bus.name=AE2 кабель и/или шина
 tile.appliedenergistics2.cell_workbench.name=Верстак для ячеек
 tile.appliedenergistics2.charger.name=Зарядник
-tile.appliedenergistics2.chest.name=МЭ сундук
+tile.appliedenergistics2.chest.name=МЭ Сундук
 tile.appliedenergistics2.condenser.name=Конденсатор материи
-tile.appliedenergistics2.controller.name=МЭ контроллер
+tile.appliedenergistics2.controller.name=МЭ Контроллер
 tile.appliedenergistics2.crank.name=Деревянная рукоятка
 tile.appliedenergistics2.creative_energy_cell.name=Творческая энергетическая ячейка
 tile.appliedenergistics2.dense_energy_cell.name=Плотная энергетическая ячейка
 tile.appliedenergistics2.energy_cell.name=Энергетическая ячейка
-tile.appliedenergistics2.drive.name=МЭ накопитель
+tile.appliedenergistics2.drive.name=МЭ Накопитель
 tile.appliedenergistics2.energy_acceptor.name=Приёмщик энергии
 tile.appliedenergistics2.grindstone.name=Кварцевый дробитель
 tile.appliedenergistics2.matrix_frame.name=Каркас матрицы
-tile.appliedenergistics2.io_port.name=МЭ порт ввода\вывода
+tile.appliedenergistics2.io_port.name=МЭ Порт ввода\вывода
 tile.appliedenergistics2.inscriber.name=Высекатель
-tile.appliedenergistics2.interface.name=МЭ интерфейс
-tile.appliedenergistics2.fluid_interface.name=МЭ жидкостный интерфейс
-tile.appliedenergistics2.quantum_link.name=МЭ камера квантовой связи
-tile.appliedenergistics2.quantum_ring.name=МЭ квантовое кольцо
+tile.appliedenergistics2.interface.name=МЭ Интерфейс
+tile.appliedenergistics2.fluid_interface.name=МЭ Жидкостный интерфейс
+tile.appliedenergistics2.quantum_link.name=МЭ Камера квантовой связи
+tile.appliedenergistics2.quantum_ring.name=МЭ Квантовое кольцо
 tile.appliedenergistics2.fluix_block.name=Изменчивый блок
 tile.appliedenergistics2.quartz_block.name=Блок истинного кварца
 tile.appliedenergistics2.chiseled_quartz_block.name=Резной блок истинного кварца
@@ -31,10 +31,10 @@ tile.appliedenergistics2.spatial_io_port.name=Пространственный 
 tile.appliedenergistics2.spatial_pylon.name=Пространственный пилон
 tile.appliedenergistics2.tiny_tnt.name=Маленький динамит
 tile.appliedenergistics2.vibration_chamber.name=Вибрационная камера
-tile.appliedenergistics2.wireless_access_point.name=МЭ беспроводная точка доступа
+tile.appliedenergistics2.wireless_access_point.name=МЭ Беспроводная точка доступа
 tile.appliedenergistics2.quartz_ore.name=Руда истинного кварца
 tile.appliedenergistics2.charged_quartz_ore.name=Заряженная руда истинного кварца
-tile.appliedenergistics2.security_station.name=МЭ терминал безопасности
+tile.appliedenergistics2.security_station.name=МЭ Терминал безопасности
 tile.appliedenergistics2.quartz_growth_accelerator.name=Ускоритель роста кристаллов
 tile.appliedenergistics2.sky_stone_block.name=Небесный камень
 tile.appliedenergistics2.smooth_sky_stone_block.name=Блок небесного камня
@@ -73,8 +73,9 @@ tile.appliedenergistics2.sky_stone_small_brick_slab.name=Плита из мал
 tile.appliedenergistics2.sky_stone_slab.name=Плита из небесного камня
 
 // Chat Messages
-chat.appliedenergistics2.ChestCannotReadStorageCell=МЭ сундук не может прочитать ячейку хранения.
+chat.appliedenergistics2.ChestCannotReadStorageCell=МЭ Сундук не может прочитать ячейку хранения.
 chat.appliedenergistics2.SettingCleared=Карта памяти очищена.
+chat.appliedenergistics2.MissingPatternsToEncode=Недостаточно шаблонов для завершения копирования.
 chat.appliedenergistics2.OutOfRange=Беспроводная сеть вне зоны действия.
 chat.appliedenergistics2.InvalidMachine=Неподходящий механизм.
 chat.appliedenergistics2.LoadedSettings=Настройки успешно загружены.
@@ -168,6 +169,8 @@ gui.appliedenergistics2.StoredFluids=Хранящиеся жидкости
 gui.appliedenergistics2.Terminal=Терминал
 gui.appliedenergistics2.InterfaceTerminal=Терминал интерфейсов
 gui.appliedenergistics2.InterfaceTerminalHint=Показать или спрятать в терминале интерфейсов.
+gui.appliedenergistics2.InterfaceConfigurationTerminal=Терминал конфигурации интерфейса
+gui.appliedenergistics2.FluidInterfaceConfigurationTerminal=Терминал жидкостной конфигурации интерфейсов
 gui.appliedenergistics2.FormationPlane=Плоскость формирования
 gui.appliedenergistics2.FluidFormationPlane=Плоскость формирования жидкости
 gui.appliedenergistics2.VibrationChamber=Вибрационная камера
@@ -175,7 +178,6 @@ gui.appliedenergistics2.NetworkDetails=Подробности сети
 gui.appliedenergistics2.StorageCells=МЭ Ячейки хранения
 gui.appliedenergistics2.IOBuses=МЭ Шина импорта\экспорта
 gui.appliedenergistics2.IOBusesFluids=МЭ Жидкостная шина импорта\экспорта
-gui.appliedenergistics2.IOBusesFluids=МЭ Шина импорта/экспорта жидкости
 gui.appliedenergistics2.Stores=Хранит
 gui.appliedenergistics2.BytesUsed=Байт использовано
 gui.appliedenergistics2.Types=Типов
@@ -220,7 +222,7 @@ gui.appliedenergistics2.Crafting=Крафт
 gui.appliedenergistics2.Scheduled=Запланировано
 gui.appliedenergistics2.CraftingStatus=Статус крафта
 gui.appliedenergistics2.FromStorage=Доступно
-gui.appliedenergistics2.ToCraft=Необходимо скрафтить
+gui.appliedenergistics2.ToCraft=Нужно еще
 gui.appliedenergistics2.CraftingPlan=План крафта
 gui.appliedenergistics2.Automatic=Автоматически
 gui.appliedenergistics2.Start=Старт
@@ -261,10 +263,10 @@ gui.tooltips.appliedenergistics2.SubstitutionsOff=Замещения выклю
 gui.tooltips.appliedenergistics2.Encode=Закодировать шаблон
 gui.tooltips.appliedenergistics2.EncodeDescription=Запишите введённый шаблон на текущий закодированный шаблон, или на доступный чистый шаблон.
 gui.tooltips.appliedenergistics2.FuzzyMode=Нечёткое сравнение
-gui.tooltips.appliedenergistics2.FZPercent_25=Разделять урон с 25%
-gui.tooltips.appliedenergistics2.FZPercent_50=Разделять урон с 50%
-gui.tooltips.appliedenergistics2.FZPercent_75=Разделять урон с 75%
-gui.tooltips.appliedenergistics2.FZPercent_99=Разделять урон с 99%
+gui.tooltips.appliedenergistics2.FZPercent_25=Разделять урон с §a25%§r
+gui.tooltips.appliedenergistics2.FZPercent_50=Разделять урон с §e50%§r
+gui.tooltips.appliedenergistics2.FZPercent_75=Разделять урон с §675%§r
+gui.tooltips.appliedenergistics2.FZPercent_99=Разделять урон с §499%§r
 gui.tooltips.appliedenergistics2.SortOrder=Порядок сортировки
 gui.tooltips.appliedenergistics2.SortBy=Сортировать по
 gui.tooltips.appliedenergistics2.FZIgnoreAll=Любое соответствие
@@ -288,8 +290,8 @@ gui.tooltips.appliedenergistics2.TrashController=Удаление по нажа
 gui.tooltips.appliedenergistics2.InterfaceBlockingMode=Блокирующий режим
 gui.tooltips.appliedenergistics2.InterfaceCraftingMode=Режим крафта
 gui.tooltips.appliedenergistics2.Trash=Уничтожить предметы
-gui.tooltips.appliedenergistics2.MatterBalls=Конденсировать в шары материи\n%s за предмет
-gui.tooltips.appliedenergistics2.Singularity=Конденсировать в сингулярности\n%s за предмет
+gui.tooltips.appliedenergistics2.MatterBalls=Конденсировать в шары материи\n§a%s§r за предмет
+gui.tooltips.appliedenergistics2.Singularity=Конденсировать в сингулярности\n§a%s§r за предмет
 gui.tooltips.appliedenergistics2.Read=Только извлекать
 gui.tooltips.appliedenergistics2.Write=Только вкладывать
 gui.tooltips.appliedenergistics2.ReadWrite=Двухсторонний
@@ -408,16 +410,16 @@ waila.appliedenergistics2.Locked=Заблокировано
 waila.appliedenergistics2.Unlocked=Разблокировано
 waila.appliedenergistics2.Showing=Показывает
 waila.appliedenergistics2.Contains=Содержит
-waila.appliedenergistics2.Channels=Каналы: %1$d из %2$d
+waila.appliedenergistics2.Channels=Каналы: §2%1$d§r из §4%2$d§r
 waila.appliedenergistics2.P2PUnlinked=Не связанный
-waila.appliedenergistics2.p2p_input_one_output=Связанный (Сторона ввода)
-waila.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона ввода) - %d выводов
-waila.appliedenergistics2.p2p_output_one_input=Связанный (Сторона вывода)
-waila.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона вывода) - %d выводов
-waila.appliedenergistics2.P2POutput=Связанный (Сторона вывода)
+waila.appliedenergistics2.p2p_input_one_output=Связанный (Сторона входа) - 1 Выход
+waila.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона входа) - §4%d§r Выходов
+waila.appliedenergistics2.p2p_output_one_input=Связанный (Сторона выхода) - 1 Вход
+waila.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона выхода) - §2%d§r Входов
+waila.appliedenergistics2.P2POutput=Связанный (Сторона выхода)
 
 // TheOneProbe
-theoneprobe.appliedenergistics2.crafting=Создается: %1$s
+theoneprobe.appliedenergistics2.crafting=Создается: §2%1$s§r
 theoneprobe.appliedenergistics2.device_online=Устройство включено
 theoneprobe.appliedenergistics2.device_offline=Устройство выключено
 theoneprobe.appliedenergistics2.device_missing_channel=У устройства нет канала.
@@ -425,15 +427,15 @@ theoneprobe.appliedenergistics2.locked=Заблокировано
 theoneprobe.appliedenergistics2.unlocked=Разблокировано
 theoneprobe.appliedenergistics2.showing=Показывает
 theoneprobe.appliedenergistics2.contains=Содержит
-theoneprobe.appliedenergistics2.channels=Каналы: %1$d из %2$d
+theoneprobe.appliedenergistics2.channels=Каналы: §2%1$d§r из §4%2$d§r
 theoneprobe.appliedenergistics2.p2p_unlinked=Не связанный
-theoneprobe.appliedenergistics2.p2p_input_one_output=Связанный (сторона ввода)
-theoneprobe.appliedenergistics2.p2p_input_many_outputs=Связанный (сторона ввода) - %d выводов
-theoneprobe.appliedenergistics2.p2p_output_one_input=Связанный (Сторона вывода)
-theoneprobe.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона вывода) - %d выводов
-theoneprobe.appliedenergistics2.p2p_output=Связанный (Сторона вывода)
-theoneprobe.appliedenergistics2.p2p_frequency=Частота: %1$s
-theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d
+theoneprobe.appliedenergistics2.p2p_input_one_output=Связанный (Сторона входа) - 1 Выход
+theoneprobe.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона входа) - §4%d§r Выходов
+theoneprobe.appliedenergistics2.p2p_output_one_input=Связанный (Сторона выхода) - 1 Вход
+theoneprobe.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона выхода) - §2%d§r Входов
+theoneprobe.appliedenergistics2.p2p_output=Связанный (Сторона выхода)
+theoneprobe.appliedenergistics2.p2p_frequency=Частота: §5%1$s§r
+theoneprobe.appliedenergistics2.stored_energy=§2%1$d§к / §4%2$d§r
 
 // Items
 item.appliedenergistics2.storage_cell_1k.name=§61k§r МЭ Ячейка хранения
@@ -444,7 +446,7 @@ item.appliedenergistics2.fluid_storage_cell_1k.name=§61k§r МЭ Жидкост
 item.appliedenergistics2.fluid_storage_cell_4k.name=§e4k§r МЭ Жидкостная ячейка хранения
 item.appliedenergistics2.fluid_storage_cell_16k.name=§a16k§r МЭ Жидкостная ячейка хранения
 item.appliedenergistics2.fluid_storage_cell_64k.name=§b64k§r МЭ Жидкостная ячейка хранения
-item.appliedenergistics2.creative_storage_cell.name=Творческая МЭ ячейка хранения
+item.appliedenergistics2.creative_storage_cell.name=Творческая МЭ Ячейка хранения
 item.appliedenergistics2.encoded_pattern.name=Кодированный шаблон
 item.appliedenergistics2.view_cell.name=Ячейка представления
 item.appliedenergistics2.facade.name=Кабельный фасад
@@ -535,12 +537,12 @@ item.appliedenergistics2.multi_part.fluid_formation_plane.name=МЭ Жидкос
 item.appliedenergistics2.multi_part.import_bus.name=МЭ Шина импорта
 item.appliedenergistics2.multi_part.fluid_import_bus.name=МЭ Жидкостная шина импорта
 item.appliedenergistics2.multi_part.interface.name=МЭ Интерфейс
-item.appliedenergistics2.multi_part.fluid_interface.name=МЭ Интерфейс жидкостей
+item.appliedenergistics2.multi_part.fluid_interface.name=МЭ Жидкостый нтерфейс
 item.appliedenergistics2.multi_part.level_emitter.name=МЭ Излучатель уровня
 item.appliedenergistics2.multi_part.fluid_level_emitter.name=МЭ Излучатель уровня
 item.appliedenergistics2.multi_part.p2p_tunnel.name=Туннель точка-точка
 item.appliedenergistics2.multi_part.pattern_terminal.name=МЭ Терминал шаблонов
-item.appliedenergistics2.multi_part.expanded_processing_pattern_terminal.name=ME терминал расширенной схемы обработки 
+item.appliedenergistics2.multi_part.expanded_processing_pattern_terminal.name=ME Терминал расширенных шаблонов
 item.appliedenergistics2.multi_part.quartz_fiber.name=Кварцевое оптическое волокно
 item.appliedenergistics2.multi_part.storage_bus.name=МЭ Шина хранения
 item.appliedenergistics2.multi_part.oredict_storage_bus.name=МЭ Шина хранения по словарю руд
@@ -550,6 +552,8 @@ item.appliedenergistics2.multi_part.inverted_toggle_bus.name=МЭ Инверти
 item.appliedenergistics2.multi_part.toggle_bus.name=МЭ Шина переключения
 item.appliedenergistics2.multi_part.crafting_monitor.name=МЭ Монитор крафта
 item.appliedenergistics2.multi_part.interface_terminal.name=МЭ Терминал интерфейсов
+item.appliedenergistics2.multi_part.interface_configuration_terminal.name=МЭ Терминал конфигурации интерфейсов
+item.appliedenergistics2.multi_part.fluid_interface_configuration_terminal.name=МЭ Терминал жидкостной конфигурации интерфейсов
 item.appliedenergistics2.multi_part.fluid_terminal.name=МЭ Жидкостный терминал
 item.appliedenergistics2.multi_part.invalid_type.name=Отключенный предмет
 
@@ -623,7 +627,7 @@ achievement.ae2.Charger.desc=Сделайте зарядник!
 achievement.ae2.CrystalGrowthAccelerator=Ускоритель - ещё мягко сказано!
 achievement.ae2.CrystalGrowthAccelerator.desc=Сделайте ускоритель роста кристаллов!
 achievement.ae2.GlassCable=Изменчивое энергетическое соединение!
-achievement.ae2.GlassCable.desc=Сделайте МЭ стеклянный кабель!
+achievement.ae2.GlassCable.desc=Сделайте МЭ Стеклянный кабель!
 achievement.ae2.Networking1=Сетевое подмастерье!
 achievement.ae2.Networking1.desc=Достигните 8 каналов, подключая устройства к сети!
 achievement.ae2.Controller=Коммутатор сети!
@@ -650,8 +654,8 @@ achievement.ae2.QNB=Квантовое туннелирование!
 achievement.ae2.QNB.desc=Сделайте квантовое соединение!
 
 // Stats
-stat.ae2.ItemsInserted=Предметов добавлено в МЭ хранилище
-stat.ae2.ItemsExtracted=Предметов извлечено из МЭ хранилища
+stat.ae2.ItemsInserted=Предметов добавлено в МЭ Хранилище
+stat.ae2.ItemsExtracted=Предметов извлечено из МЭ Хранилища
 stat.ae2.TurnedCranks=Сломано рукояток
 
 //Keys
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
index 18e09d8b6..06fc63a1c 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json
@@ -1,12 +1,122 @@
 {
-    "parent": "block/cube",
-    "textures": {
-        "particle": "appliedenergistics2:blocks/chest/side",
-        "up": "appliedenergistics2:blocks/chest/top",
-        "down": "appliedenergistics2:blocks/chest/bottom",
-        "north": "appliedenergistics2:blocks/chest/front",
-        "east": "appliedenergistics2:blocks/chest/side",
-        "south": "appliedenergistics2:blocks/chest/side",
-        "west": "appliedenergistics2:blocks/chest/side"
-    }
-}
+	"credit": "Made with Blockbench",
+	"textures": {
+		"up": "appliedenergistics2:blocks/chest/top",
+		"down": "appliedenergistics2:blocks/chest/bottom",
+		"north": "appliedenergistics2:blocks/chest/front",
+		"particle": "appliedenergistics2:blocks/chest/side",
+		"east": "appliedenergistics2:blocks/chest/side"
+	},
+	"elements": [
+		{
+			"name": "inside_border_right",
+			"from": [4, 3, 0],
+			"to": [5, 8, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 1]},
+			"faces": {
+				"east": {"uv": [0, 6, 1, 11], "rotation": 180, "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_right",
+			"from": [2, 1, 1],
+			"to": [5, 12, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 3]},
+			"faces": {
+				"east": {"uv": [5, 2, 14, 13], "texture": "#down"}
+			}
+		},
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#east"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#east"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#east"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#up"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_back",
+			"from": [5, 4, 7],
+			"to": [11, 7, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 8]},
+			"faces": {
+				"north": {"uv": [3, 2, 14, 14], "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_left",
+			"from": [11, 1, 1],
+			"to": [14, 12, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [18, 11, 3]},
+			"faces": {
+				"north": {"uv": [2, 5, 2, 5], "texture": "#down"},
+				"west": {"uv": [5, 2, 14, 13], "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_top",
+			"from": [5, 6, 1],
+			"to": [11, 9, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 3]},
+			"faces": {
+				"north": {"uv": [14, 12, 14, 12], "texture": "#down"},
+				"down": {"uv": [12, 15, 12, 15], "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_bottom",
+			"from": [5, 1, 1],
+			"to": [11, 4, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [15, 11, 3]},
+			"faces": {
+				"north": {"uv": [1, 6, 1, 6], "texture": "#down"},
+				"up": {"uv": [6, 1, 6, 1], "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_border_bottom",
+			"from": [4, 0, 0],
+			"to": [12, 3, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [15, 10, 1]},
+			"faces": {
+				"up": {"uv": [0, 4, 9, 13], "rotation": 90, "texture": "#missing"}
+			}
+		},
+		{
+			"name": "inside_border_top",
+			"from": [5, 7, 0],
+			"to": [12, 10, 9],
+			"rotation": {"angle": 0, "axis": "y", "origin": [15, 17, 1]},
+			"faces": {
+				"down": {"uv": [0, 4, 9, 13], "rotation": 270, "texture": "#down"}
+			}
+		},
+		{
+			"name": "inside_border_left",
+			"from": [11, 3, 0],
+			"to": [12, 8, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [15, 13, 1]},
+			"faces": {
+				"west": {"uv": [0, 8, 1, 13], "texture": "#down"}
+			}
+		}
+	],
+	"groups": [
+		{
+			"name": "chest",
+			"origin": [8, 8, 8],
+			"color": 0,
+			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+		},
+		{
+			"name": "cells",
+			"origin": [8, 8, 8],
+			"color": 0,
+			"children": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json
index 9e9a7eaca..f15d8be3d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json
@@ -1,24 +1,4 @@
 {
-    "textures": {
-        "state": "appliedenergistics2:blocks/chest/cell_state_empty"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#state"
-                }
-            }
-        }
-    ]
-}
+    "textures": {},
+    "elements": []
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
index 1a451d77e..b20bb847d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json
@@ -1,47 +1,38 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-        "state": "appliedenergistics2:blocks/chest/cell_state_full"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#backdrop"
-                }
-            }
-        },
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#state",
-                    "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"credit": "Made with Blockbench",
+	"textures": {
+		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_full",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [5, 4, 0],
+			"to": [11, 6, 1],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
+				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [1, 7, 2, 8], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
index 59b9eb03f..01fb60a16 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json
@@ -1,24 +1,17 @@
 {
-    "textures": {
-        "state": "appliedenergistics2:blocks/chest/cell_state_offline"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#state"
-                }
-            }
-        }
-    ]
-}
+	"credit": "Made with Blockbench",
+	"textures": {
+		"front": "appliedenergistics2:blocks/chest/cell_state_offline"
+	},
+	"elements": [
+		{
+			"from": [5, 4, 0],
+			"to": [11, 6, 1],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
+				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
index 6ef9f3c8b..dbf8f806e 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json
@@ -1,47 +1,38 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-        "state": "appliedenergistics2:blocks/chest/cell_state_online"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#backdrop"
-                }
-            }
-        },
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#state",
-                    "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"ae2_uvl_marker": true,
+	"parent": "block/block",
+	"textures": {
+		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_online",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [5, 4, 0],
+			"to": [11, 6, 1],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
+				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"faces": {
+				"north": {"uv": [1, 3, 2, 4], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
index d87a670e0..c90088364 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json
@@ -1,47 +1,38 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-        "state": "appliedenergistics2:blocks/chest/cell_state_types_full"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#backdrop"
-                }
-            }
-        },
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#state",
-                    "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"credit": "Made with Blockbench",
+	"textures": {
+		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_types_full",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [5, 4, 0],
+			"to": [11, 6, 1],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
+				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 4, 0],
+			"to": [10, 5, 0],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [1, 5, 2, 6], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
index 6ea61de80..56b6c873d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json
@@ -22,4 +22,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
index 2b477b8c3..507543afc 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json
@@ -21,9 +21,10 @@
                 "up": {
                     "texture": "#lights_bright",
                     "tintindex": 3,
+                    "unlit": true,
                     "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
+                        "block": 15,
+                        "sky": 15
                     }
                 }
             }
@@ -43,9 +44,10 @@
                 "up": {
                     "texture": "#lights_medium",
                     "tintindex": 2,
+                    "unlit": true,
                     "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
+                        "block": 15,
+                        "sky": 15
                     }
                 }
             }
@@ -65,12 +67,13 @@
                 "up": {
                     "texture": "#lights_dark",
                     "tintindex": 1,
+                    "unlit": true,
                     "uvlightmap": {
-                        "block": 0.007,
-                        "sky": 0.007
+                        "block": 15,
+                        "sky": 15
                     }
                 }
             }
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
index 9812538dd..88c523044 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json
@@ -1,172 +1,284 @@
 {
-    "parent": "block/block",
-    "textures": {
-        "particle": "appliedenergistics2:blocks/drive_side",
-        "side": "appliedenergistics2:blocks/drive_side",
-        "bottom": "appliedenergistics2:blocks/drive_bottom",
-        "top": "appliedenergistics2:blocks/drive_top",
-        "front": "appliedenergistics2:blocks/drive_front",
-        "inner": "appliedenergistics2:blocks/drive_bottom"
-    },
-    "elements": [
-        {
-            "name": "Right Side Panel",
-            "from": [
-                0.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                2.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#inner"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                }
-            }
-        },
-        {
-            "name": "Left Side Panel",
-            "from": [
-                14.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Back Panel",
-            "from": [
-                2.0,
-                1.0,
-                8.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#inner"
-                },
-                "south": {
-                    "texture": "#side"
-                }
-            }
-        },
-        {
-            "name": "Bottom Panel",
-            "from": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                1.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#bottom"
-                }
-            }
-        },
-        {
-            "name": "Top Panel",
-            "from": [
-                0.0,
-                15.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                16.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "up": {
-                    "texture": "#top"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Front Panel",
-            "from": [
-                2.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                }
-            }
-        }
-    ]
+	"parent": "block/block",
+		"ambientocclusion": false,
+		"textures": {
+		"particle": "appliedenergistics2:blocks/drive_side",
+		"side": "appliedenergistics2:blocks/drive_side",
+		"bottom": "appliedenergistics2:blocks/drive_bottom",
+		"top": "appliedenergistics2:blocks/drive_top",
+		"front": "appliedenergistics2:blocks/drive_front"
+		},
+		"elements": [
+		{
+		"name": "Right Side Panel",
+		"from": [0, 1, 0],
+		"to": [2, 15, 16],
+		"faces": {
+				"north": {
+				"uv": [15, 1, 16, 15],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"east": {
+				"uv": [0, 2, 16, 14],
+				"rotation": 180,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"south": {
+				"uv": [0, 1, 1, 15],
+				"texture": "#side",
+				"cullface": "south"
+				},
+				"west": {
+				"uv": [0, 1, 16, 15],
+				"texture": "#side",
+				"cullface": "west"
+				}
+		}
+		},
+		{
+		"name": "Left Side Panel",
+		"from": [14, 1, 0],
+		"to": [16, 15, 16],
+		"faces": {
+				"north": {
+				"uv": [0, 1, 1, 15],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"east": {
+				"uv": [0, 1, 16, 15],
+				"texture": "#side",
+				"cullface": "east"
+				},
+				"south": {
+				"uv": [15, 1, 16, 15],
+				"texture": "#side",
+				"cullface": "south"
+				},
+				"west": {
+				"uv": [0, 2, 16, 14],
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Back Panel",
+		"from": [2, 1, 7],
+		"to": [14, 15, 16],
+		"rotation": {
+				"angle": 0,
+				"axis": "y",
+				"origin": [8, 8, 9]
+		},
+		"faces": {
+				"north": {
+				"uv": [13, 2, 14, 13],
+				"texture": "#bottom"
+				},
+				"south": {
+				"uv": [1, 1, 15, 15],
+				"texture": "#side",
+				"cullface": "south"
+				}
+		}
+		},
+		{
+		"name": "Bottom Panel",
+		"from": [0, 0, 0],
+		"to": [16, 1, 16],
+		"faces": {
+				"north": {
+				"uv": [0, 15, 16, 16],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"east": {
+				"uv": [0, 15, 16, 16],
+				"texture": "#side",
+				"cullface": "east"
+				},
+				"south": {
+				"uv": [0, 15, 16, 16],
+				"texture": "#side",
+				"cullface": "south"
+				},
+				"west": {
+				"uv": [0, 15, 16, 16],
+				"texture": "#side",
+				"cullface": "west"
+				},
+				"up": {
+				"uv": [0, 2, 16, 14],
+				"rotation": 90,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"down": {
+				"uv": [0, 0, 16, 16],
+				"texture": "#bottom",
+				"cullface": "down"
+				}
+		}
+		},
+		{
+		"name": "Top Panel",
+		"from": [0, 15, 0],
+		"to": [16, 16, 16],
+		"faces": {
+				"north": {
+				"uv": [0, 0, 16, 1],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"east": {
+				"uv": [0, 0, 16, 1],
+				"texture": "#side",
+				"cullface": "east"
+				},
+				"south": {
+				"uv": [0, 0, 16, 1],
+				"texture": "#side",
+				"cullface": "south"
+				},
+				"west": {
+				"uv": [0, 0, 16, 1],
+				"texture": "#side",
+				"cullface": "west"
+				},
+				"up": {
+				"uv": [0, 0, 16, 16],
+				"texture": "#top",
+				"cullface": "up"
+				},
+				"down": {
+				"uv": [0, 2, 16, 14],
+				"rotation": 270,
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Front Panel",
+		"from": [7, 1, 1],
+		"to": [9, 15, 7],
+		"faces": {
+				"north": {
+				"uv": [7, 1, 9, 15],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"east": {
+				"uv": [1, 2, 7, 14],
+				"rotation": 180,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"west": {
+				"uv": [1, 2, 7, 14],
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Separator",
+		"from": [1, 3, 2],
+		"to": [15, 4, 7],
+		"faces": {
+				"north": {
+				"uv": [1, 12, 15, 13],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"up": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 90,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"down": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 270,
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Separator",
+		"from": [1, 6, 2],
+		"to": [15, 7, 7],
+		"faces": {
+				"north": {
+				"uv": [1, 9, 15, 10],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"up": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 90,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"down": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 270,
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Separator",
+		"from": [1, 9, 2],
+		"to": [15, 10, 7],
+		"faces": {
+				"north": {
+				"uv": [1, 6, 15, 7],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"up": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 90,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"down": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 270,
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		},
+		{
+		"name": "Separator",
+		"from": [1, 12, 2],
+		"to": [15, 13, 7],
+		"faces": {
+				"north": {
+				"uv": [1, 3, 15, 4],
+				"texture": "#front",
+				"cullface": "north"
+				},
+				"up": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 90,
+				"texture": "#bottom",
+				"cullface": "north"
+				},
+				"down": {
+				"uv": [1, 2, 6, 14],
+				"rotation": 270,
+				"texture": "#bottom",
+				"cullface": "north"
+				}
+		}
+		}
+		]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json
index 1f5462186..faac3a35a 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json
@@ -1,273 +1,284 @@
 {
-    "parent": "block/block",
-    "textures": {
-        "side": "appliedenergistics2:blocks/drive_side",
-        "bottom": "appliedenergistics2:blocks/drive_bottom",
-        "top": "appliedenergistics2:blocks/drive_top",
-        "front": "appliedenergistics2:blocks/drive_front",
-        "inner": "appliedenergistics2:blocks/drive_bottom"
-    },
-    "elements": [
-        {
-            "name": "Right Side Panel",
-            "from": [
-                0.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                2.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#inner"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                }
-            }
+  "parent": "block/block",
+  "ambientocclusion": false,
+  "textures": {
+    "particle": "appliedenergistics2:blocks/drive_side",
+    "side": "appliedenergistics2:blocks/drive_side",
+    "bottom": "appliedenergistics2:blocks/drive_bottom",
+    "top": "appliedenergistics2:blocks/drive_top",
+    "front": "appliedenergistics2:blocks/drive_front"
+  },
+  "elements": [
+    {
+      "name": "Right Side Panel",
+      "from": [0, 1, 0],
+      "to": [2, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#front",
+          "cullface": "north"
         },
-        {
-            "name": "Left Side Panel",
-            "from": [
-                14.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#inner"
-                }
-            }
+        "east": {
+          "uv": [0, 2, 16, 14],
+          "rotation": 180,
+          "texture": "#bottom",
+          "cullface": "north"
         },
-        {
-            "name": "Back Panel",
-            "from": [
-                2.0,
-                1.0,
-                8.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#inner"
-                },
-                "south": {
-                    "texture": "#side"
-                }
-            }
+        "south": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#side",
+          "cullface": "south"
         },
-        {
-            "name": "Bottom Panel",
-            "from": [
-                0.0,
-                0.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                1.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#bottom"
-                }
-            }
-        },
-        {
-            "name": "Top Panel",
-            "from": [
-                0.0,
-                15.0,
-                0.0
-            ],
-            "to": [
-                16.0,
-                16.0,
-                16.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "up": {
-                    "texture": "#top"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Middle Strut",
-            "from": [
-                7.0,
-                1.0,
-                0.0
-            ],
-            "to": [
-                9.0,
-                15.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "east": {
-                    "texture": "#inner"
-                },
-                "west": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Separator",
-            "from": [
-                2.0,
-                3.0,
-                1.0
-            ],
-            "to": [
-                14.0,
-                4.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Separator",
-            "from": [
-                2.0,
-                6.0,
-                1.0
-            ],
-            "to": [
-                14.0,
-                7.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Separator",
-            "from": [
-                2.0,
-                9.0,
-                1.0
-            ],
-            "to": [
-                14.0,
-                10.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
-        },
-        {
-            "name": "Separator",
-            "from": [
-                2.0,
-                12.0,
-                1.0
-            ],
-            "to": [
-                14.0,
-                13.0,
-                8.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front"
-                },
-                "up": {
-                    "texture": "#inner"
-                },
-                "down": {
-                    "texture": "#inner"
-                }
-            }
+        "west": {
+          "uv": [0, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "west"
         }
-    ]
+      }
+    },
+    {
+      "name": "Left Side Panel",
+      "from": [14, 1, 0],
+      "to": [16, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 2, 16, 14],
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Back Panel",
+      "from": [2, 1, 7],
+      "to": [14, 15, 16],
+      "rotation": {
+        "angle": 0,
+        "axis": "y",
+        "origin": [8, 8, 9]
+      },
+      "faces": {
+        "north": {
+          "uv": [13, 2, 14, 13],
+          "texture": "#bottom"
+        },
+        "south": {
+          "uv": [1, 1, 15, 15],
+          "texture": "#side",
+          "cullface": "south"
+        }
+      }
+    },
+    {
+      "name": "Bottom Panel",
+      "from": [0, 0, 0],
+      "to": [16, 1, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "west"
+        },
+        "up": {
+          "uv": [0, 2, 16, 14],
+          "rotation": 90,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#bottom",
+          "cullface": "down"
+        }
+      }
+    },
+    {
+      "name": "Top Panel",
+      "from": [0, 15, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#side",
+          "cullface": "west"
+        },
+        "up": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#top",
+          "cullface": "up"
+        },
+        "down": {
+          "uv": [0, 2, 16, 14],
+          "rotation": 270,
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Front Panel",
+      "from": [7, 1, 1],
+      "to": [9, 15, 7],
+      "faces": {
+        "north": {
+          "uv": [7, 1, 9, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [1, 2, 7, 14],
+          "rotation": 180,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "west": {
+          "uv": [1, 2, 7, 14],
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 3, 2],
+      "to": [15, 4, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 12, 15, 13],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 90,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 270,
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 6, 2],
+      "to": [15, 7, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 9, 15, 10],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 90,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 270,
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 9, 2],
+      "to": [15, 10, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 6, 15, 7],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 90,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 270,
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 12, 2],
+      "to": [15, 13, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 3, 15, 4],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 90,
+          "texture": "#bottom",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [1, 2, 6, 14],
+          "rotation": 270,
+          "texture": "#bottom",
+          "cullface": "north"
+        }
+      }
+    }
+  ]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
index 0f1c68022..6334701b6 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json
@@ -1,32 +1,4 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "front": "appliedenergistics2:blocks/drive_cell_states"
-    },
-    "elements": [
-        {
-            "name": "Cell Backdrop",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        10,
-                        5,
-                        12
-                    ]
-                }
-            }
-        }
-    ]
+  "textures": {},
+  "elements": []
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
index 06c5b1214..5c89a5566 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json
@@ -1,60 +1,29 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "front": "appliedenergistics2:blocks/drive_cell_states"
-    },
-    "elements": [
-        {
-            "name": "Cell Backdrop",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        8,
-                        5,
-                        10
-                    ]
-                }
-            }
-        },
-        {
-            "name": "Cell Light",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        6,
-                        5,
-                        8
-                    ],
-                    "uvlightmap": {
-                        "sky": 0.007,
-                        "block": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"textures": {
+		"front": "appliedenergistics2:blocks/drive_cell_states",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
+				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 6, 5, 8], "texture": "#top_front"},
+				"down": {"uv": [5, 8, 0, 7], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json
index 555f2064d..b837fd99d 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json
@@ -1,31 +1,18 @@
 {
-    "textures": {
-        "front": "appliedenergistics2:blocks/drive_cell_states"
-    },
-    "elements": [
-        {
-            "name": "Cell",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        0,
-                        5,
-                        2
-                    ]
-                }
-            }
-        }
-    ]
-}
+	"ambientocclusion": false,
+	"textures": {
+		"front": "appliedenergistics2:blocks/drive_cell_states"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"faces": {
+				"north": {"uv": [0, 0, 5, 2], "texture": "#front"},
+				"up": {"uv": [0, 0, 5, 1], "texture": "#front"},
+				"down": {"uv": [5, 2, 0, 1], "texture": "#front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
index c192ded2e..3fe7493de 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json
@@ -1,60 +1,29 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "front": "appliedenergistics2:blocks/drive_cell_states"
-    },
-    "elements": [
-        {
-            "name": "Cell Backdrop",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        8,
-                        5,
-                        10
-                    ]
-                }
-            }
-        },
-        {
-            "name": "Cell Light",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        2,
-                        5,
-                        4
-                    ],
-                    "uvlightmap": {
-                        "sky": 0.007,
-                        "block": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"textures": {
+		"front": "appliedenergistics2:blocks/drive_cell_states",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
+				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 2, 5, 4], "texture": "#top_front"},
+				"down": {"uv": [5, 4, 0, 3], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
index 38a8738a3..b8d910338 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json
@@ -1,60 +1,29 @@
 {
-    "ae2_uvl_marker": true,
-    "textures": {
-        "front": "appliedenergistics2:blocks/drive_cell_states"
-    },
-    "elements": [
-        {
-            "name": "Cell Backdrop",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        8,
-                        5,
-                        10
-                    ]
-                }
-            }
-        },
-        {
-            "name": "Cell Light",
-            "from": [
-                9.0,
-                13.0,
-                0.0
-            ],
-            "to": [
-                14.0,
-                15.0,
-                1.0
-            ],
-            "faces": {
-                "north": {
-                    "texture": "#front",
-                    "uv": [
-                        0,
-                        4,
-                        5,
-                        6
-                    ],
-                    "uvlightmap": {
-                        "sky": 0.007,
-                        "block": 0.007
-                    }
-                }
-            }
-        }
-    ]
-}
+	"textures": {
+		"front": "appliedenergistics2:blocks/drive_cell_states",
+		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+	},
+	"elements": [
+		{
+			"name": "Cell Backdrop",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
+				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+			}
+		},
+		{
+			"name": "Cell Light",
+			"from": [9, 13, 1],
+			"to": [14, 15, 2],
+			"shade": false,
+			"faces": {
+				"north": {"uv": [0, 4, 5, 6], "texture": "#top_front"},
+				"down": {"uv": [5, 6, 0, 5], "texture": "#top_front"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta
index 8e2af92cc..313e1f2b7 100644
--- a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta
+++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta
@@ -2,6 +2,7 @@
   "animation": {
     "frametime": 3,
     "frames": [
+      0,
       1,
       2,
       3,
@@ -12,8 +13,7 @@
       8,
       9,
       10,
-      11,
-      0
+      11
     ]
   }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png
index 1f4fd0ef9..83823f43d 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png
index 9e602fd11..265c42c1e 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png
index afce73be4..684e566e7 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png
index a173bb966..b67605245 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png
index 103babce5..c4344b5da 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png
index 9e602fd11..c4344b5da 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell3.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png
index 7fa921c87..39c79895f 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell4.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png
index 3c6240776..39c79895f 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png
index 72c6c5d01..28dd12c6e 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png
index 1e714aef7..28dd12c6e 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png
new file mode 100644
index 000000000..7c3a4f3f5
Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta
new file mode 100644
index 000000000..7401007ae
--- /dev/null
+++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta
@@ -0,0 +1,10 @@
+{
+  "ctm": {
+    "ctm_version": 1,
+    "layer": "BLOOM",
+    "gregtech": true,
+    "extra": {
+      "light": 15
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png
index cc184ca06..001a211c6 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png
index 2e827af8a..5de9b807d 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png
index 718deab9f..ab25243c1 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png
index 742f2d795..d0a013318 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell2.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png
index cc184ca06..d0a013318 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png
index ca9143a39..7bd3e3281 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png
index d7ccdf575..7bd3e3281 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png
index d2c80dfea..b2f92f28e 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell6.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png
index 9c18613e9..b2f92f28e 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png and b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png differ