diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcastledoor.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcastledoor.png
index 4f59a86cfc..d980923570 100644
Binary files a/tiled/frackinuniverse-custom/objects/nightar/nightarcastledoor.png and b/tiled/frackinuniverse-custom/objects/nightar/nightarcastledoor.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcellbed.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcellbed.png
new file mode 100644
index 0000000000..93933de59d
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcellbed.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarchainfence.png b/tiled/frackinuniverse-custom/objects/nightar/nightarchainfence.png
new file mode 100644
index 0000000000..ed0608fbe1
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarchainfence.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarchandelier.png b/tiled/frackinuniverse-custom/objects/nightar/nightarchandelier.png
index 2c60250f00..03c7f74c83 100644
Binary files a/tiled/frackinuniverse-custom/objects/nightar/nightarchandelier.png and b/tiled/frackinuniverse-custom/objects/nightar/nightarchandelier.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarclock.png b/tiled/frackinuniverse-custom/objects/nightar/nightarclock.png
new file mode 100644
index 0000000000..47f75fcfdd
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarclock.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair.png
new file mode 100644
index 0000000000..5347f9c33f
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair2.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair2.png
new file mode 100644
index 0000000000..fed469d5e1
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair2.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair3.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair3.png
new file mode 100644
index 0000000000..e9646e6442
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfychair3.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcomfyfootstool.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfyfootstool.png
new file mode 100644
index 0000000000..4184486443
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcomfyfootstool.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcomputer.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcomputer.png
index 4dd998acda..ab84e8f7a1 100644
Binary files a/tiled/frackinuniverse-custom/objects/nightar/nightarcomputer.png and b/tiled/frackinuniverse-custom/objects/nightar/nightarcomputer.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarconsole.png b/tiled/frackinuniverse-custom/objects/nightar/nightarconsole.png
index 1539c96a6b..4dcea4a7a4 100644
Binary files a/tiled/frackinuniverse-custom/objects/nightar/nightarconsole.png and b/tiled/frackinuniverse-custom/objects/nightar/nightarconsole.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcookingpot.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcookingpot.png
new file mode 100644
index 0000000000..d289ec6d84
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcookingpot.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcouch.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcouch.png
new file mode 100644
index 0000000000..dd808b4f95
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcouch.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarcounter.png b/tiled/frackinuniverse-custom/objects/nightar/nightarcounter.png
new file mode 100644
index 0000000000..97f984092f
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarcounter.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightardesk.png b/tiled/frackinuniverse-custom/objects/nightar/nightardesk.png
new file mode 100644
index 0000000000..8da90192d2
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightardesk.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightardesk2.png b/tiled/frackinuniverse-custom/objects/nightar/nightardesk2.png
new file mode 100644
index 0000000000..799129d7d4
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightardesk2.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightardresser2.png b/tiled/frackinuniverse-custom/objects/nightar/nightardresser2.png
new file mode 100644
index 0000000000..f28650c61e
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightardresser2.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp.png b/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp.png
new file mode 100644
index 0000000000..d71e572625
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp2.png b/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp2.png
new file mode 100644
index 0000000000..b72895c289
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarfancystreetlamp2.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarfountain.png b/tiled/frackinuniverse-custom/objects/nightar/nightarfountain.png
new file mode 100644
index 0000000000..2ac3e16cc6
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarfountain.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarfurnace.png b/tiled/frackinuniverse-custom/objects/nightar/nightarfurnace.png
new file mode 100644
index 0000000000..006843ebf9
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarfurnace.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarglobe.png b/tiled/frackinuniverse-custom/objects/nightar/nightarglobe.png
new file mode 100644
index 0000000000..05d6fea046
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarglobe.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarglobe2.png b/tiled/frackinuniverse-custom/objects/nightar/nightarglobe2.png
new file mode 100644
index 0000000000..cbb420ac8e
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarglobe2.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarjuicekeg.png b/tiled/frackinuniverse-custom/objects/nightar/nightarjuicekeg.png
new file mode 100644
index 0000000000..9cfd7bc4f7
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarjuicekeg.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarlight.png b/tiled/frackinuniverse-custom/objects/nightar/nightarlight.png
new file mode 100644
index 0000000000..4c20355138
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarlight.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmatriarch.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmatriarch.png
new file mode 100644
index 0000000000..56b8d9b2f3
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmatriarch.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedal.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedal.png
new file mode 100644
index 0000000000..5a6edae9d8
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedal.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmor.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmor.png
new file mode 100644
index 0000000000..78eff63969
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmor.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorarmed.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorarmed.png
new file mode 100644
index 0000000000..d03c615b39
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorarmed.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorswitch.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorswitch.png
new file mode 100644
index 0000000000..47088b82c9
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalarmorswitch.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcase.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcase.png
new file mode 100644
index 0000000000..4f54368cd1
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcase.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcaseswitch.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcaseswitch.png
new file mode 100644
index 0000000000..9e9dbe2be0
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalbookcaseswitch.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcabinet.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcabinet.png
new file mode 100644
index 0000000000..f0ace097d3
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcabinet.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcellbed.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcellbed.png
new file mode 100644
index 0000000000..700c1bebb0
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcellbed.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalchest.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalchest.png
new file mode 100644
index 0000000000..440ed1b624
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalchest.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalclock.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalclock.png
new file mode 100644
index 0000000000..d9ca34d02f
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalclock.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcodex.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcodex.png
new file mode 100644
index 0000000000..de5f519fb2
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcodex.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcounter.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcounter.png
new file mode 100644
index 0000000000..800ab2e38a
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalcounter.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldesk.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldesk.png
new file mode 100644
index 0000000000..680ad83dd9
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldesk.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldiningtable.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldiningtable.png
new file mode 100644
index 0000000000..704886c3b8
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldiningtable.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldresser.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldresser.png
new file mode 100644
index 0000000000..7864ef67d1
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievaldresser.png differ
diff --git a/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalfireplace.png b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalfireplace.png
new file mode 100644
index 0000000000..4937866c72
Binary files /dev/null and b/tiled/frackinuniverse-custom/objects/nightar/nightarmedievalfireplace.png differ