diff --git a/res/layouts/pages/content.xml.lua b/res/layouts/pages/content.xml.lua
index 5c6f5638..2a21d57d 100644
--- a/res/layouts/pages/content.xml.lua
+++ b/res/layouts/pages/content.xml.lua
@@ -64,7 +64,6 @@ function check_dependencies(packinfo)
         local depid = dep:sub(2,-1)
         if dep:sub(1,1) == '!' then 
             if not table.has(packs_all, depid) then
-                packinfo.description = ""
                 return string.format(
                     "%s (%s)", gui.str("error.dependency-not-found"), depid
                 )
diff --git a/res/layouts/templates/pack.xml b/res/layouts/templates/pack.xml
index ffb94518..5eb2f74c 100644
--- a/res/layouts/templates/pack.xml
+++ b/res/layouts/templates/pack.xml
@@ -8,7 +8,7 @@
         %{creator}
     </label>
     <label if='%{error}' pos='80,28' size='355,50' multiline='true' color='#FF4040'>%{error}</label>
-    <label pos='80,28' size='355,50' multiline='true' color='#FFFFFFB2'>
+    <label ifnot='%{error}' pos='80,28' size='355,50' multiline='true' color='#FFFFFFB2'>
         %{description}
     </label>
     <image pos='8,8' src='%{icon}' size='64'/>
diff --git a/src/assets/Assets.cpp b/src/assets/Assets.cpp
index 394e36bb..99531dfb 100644
--- a/src/assets/Assets.cpp
+++ b/src/assets/Assets.cpp
@@ -1,11 +1,11 @@
 #include "Assets.h"
 
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../graphics/core/Texture.hpp"
 #include "../graphics/core/Shader.hpp"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Font.hpp"
-#include "../frontend/UiDocument.h"
+#include "../frontend/UiDocument.hpp"
 #include "../logic/scripting/scripting.h"
 
 Assets::~Assets() {
diff --git a/src/assets/AssetsLoader.cpp b/src/assets/AssetsLoader.cpp
index d626582e..374c67d5 100644
--- a/src/assets/AssetsLoader.cpp
+++ b/src/assets/AssetsLoader.cpp
@@ -1,13 +1,8 @@
 #include "AssetsLoader.h"
+
 #include "Assets.h"
-
-#include "assetload_funcs.h"
-
-#include <iostream>
-#include <memory>
-
+#include "assetload_funcs.hpp"
 #include "../util/ThreadPool.hpp"
-
 #include "../constants.h"
 #include "../data/dynamic.h"
 #include "../debug/Logger.hpp"
@@ -19,6 +14,9 @@
 #include "../graphics/core/Texture.hpp"
 #include "../logic/scripting/scripting.h"
 
+#include <iostream>
+#include <memory>
+
 static debug::Logger logger("assets-loader");
 
 AssetsLoader::AssetsLoader(Assets* assets, const ResPaths* paths) 
diff --git a/src/assets/assetload_funcs.cpp b/src/assets/assetload_funcs.cpp
index 1c4b5ad5..18379942 100644
--- a/src/assets/assetload_funcs.cpp
+++ b/src/assets/assetload_funcs.cpp
@@ -1,7 +1,8 @@
-#include "assetload_funcs.h"
+#include "assetload_funcs.hpp"
+
 #include "Assets.h"
 #include "AssetsLoader.h"
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../files/files.h"
 #include "../files/engine_paths.h"
 #include "../coders/imageio.hpp"
@@ -13,7 +14,7 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/core/Font.hpp"
 #include "../graphics/core/TextureAnimation.hpp"
-#include "../frontend/UiDocument.h"
+#include "../frontend/UiDocument.hpp"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/src/assets/assetload_funcs.h b/src/assets/assetload_funcs.hpp
similarity index 92%
rename from src/assets/assetload_funcs.h
rename to src/assets/assetload_funcs.hpp
index 8bcaf728..5c5eb79c 100644
--- a/src/assets/assetload_funcs.h
+++ b/src/assets/assetload_funcs.hpp
@@ -1,5 +1,5 @@
-#ifndef ASSETS_ASSET_LOADERS_H_
-#define ASSETS_ASSET_LOADERS_H_
+#ifndef ASSETS_ASSET_LOADERS_HPP_
+#define ASSETS_ASSET_LOADERS_HPP_
 
 #include "Assets.h"
 
@@ -59,4 +59,4 @@ namespace assetload {
     );
 }
 
-#endif // ASSETS_ASSET_LOADERS_H_
+#endif // ASSETS_ASSET_LOADERS_HPP_
diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp
index adca0023..d4b2fe25 100644
--- a/src/audio/AL/ALAudio.cpp
+++ b/src/audio/AL/ALAudio.cpp
@@ -1,10 +1,11 @@
-#include "ALAudio.h"
-#include "alutil.h"
+#include "ALAudio.hpp"
+
+#include "alutil.hpp"
+#include "../../debug/Logger.hpp"
+
 #include <string>
 #include <iostream>
 
-#include "../../debug/Logger.hpp"
-
 static debug::Logger logger("al-audio");
 
 using namespace audio;
diff --git a/src/audio/AL/ALAudio.h b/src/audio/AL/ALAudio.hpp
similarity index 97%
rename from src/audio/AL/ALAudio.h
rename to src/audio/AL/ALAudio.hpp
index bcf6c4cf..f4a5df1a 100644
--- a/src/audio/AL/ALAudio.h
+++ b/src/audio/AL/ALAudio.hpp
@@ -1,5 +1,8 @@
-#ifndef SRC_AUDIO_AUDIO_H_
-#define SRC_AUDIO_AUDIO_H_
+#ifndef SRC_AUDIO_AUDIO_HPP_
+#define SRC_AUDIO_AUDIO_HPP_
+
+#include "../audio.hpp"
+#include "../../typedefs.h"
 
 #include <queue>
 #include <vector>
@@ -15,9 +18,6 @@
 #include <AL/alc.h>
 #endif
 
-#include "../audio.h"
-#include "../../typedefs.h"
-
 namespace audio {
     struct ALBuffer;
     class ALAudio;
@@ -168,4 +168,4 @@ namespace audio {
     };
 }
 
-#endif /* SRC_AUDIO_AUDIO_H_ */
+#endif // SRC_AUDIO_AUDIO_HPP_
diff --git a/src/audio/AL/alutil.cpp b/src/audio/AL/alutil.cpp
index 0dcfce3d..839a7545 100644
--- a/src/audio/AL/alutil.cpp
+++ b/src/audio/AL/alutil.cpp
@@ -1,4 +1,4 @@
-#include "alutil.h"
+#include "alutil.hpp"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/audio/AL/alutil.h b/src/audio/AL/alutil.hpp
similarity index 95%
rename from src/audio/AL/alutil.h
rename to src/audio/AL/alutil.hpp
index 193fa0d3..8c08248d 100644
--- a/src/audio/AL/alutil.h
+++ b/src/audio/AL/alutil.hpp
@@ -1,5 +1,7 @@
-#ifndef SRC_AUDIO_AUDIOUTIL_H_
-#define SRC_AUDIO_AUDIOUTIL_H_
+#ifndef AUDIO_AUDIOUTIL_HPP_
+#define AUDIO_AUDIOUTIL_HPP_
+
+#include "../../typedefs.h"
 
 #include <string>
 #include <type_traits>
@@ -12,7 +14,6 @@
 #endif
 
 #include <glm/glm.hpp>
-#include "../../typedefs.h"
 
 #define AL_CHECK(STATEMENT) STATEMENT; AL::check_errors(__FILE__, __LINE__)
 #define AL_GET_ERROR() AL::check_errors(__FILE__, __LINE__)
@@ -80,4 +81,4 @@ namespace AL {
     }
 }
 
-#endif /* SRC_AUDIO_AUDIOUTIL_H_ */
+#endif // AUDIO_AUDIOUTIL_HPP_
diff --git a/src/audio/NoAudio.cpp b/src/audio/NoAudio.cpp
index b6193fd0..3c40277d 100644
--- a/src/audio/NoAudio.cpp
+++ b/src/audio/NoAudio.cpp
@@ -1,4 +1,4 @@
-#include "NoAudio.h"
+#include "NoAudio.hpp"
 
 using namespace audio;
 
diff --git a/src/audio/NoAudio.h b/src/audio/NoAudio.hpp
similarity index 95%
rename from src/audio/NoAudio.h
rename to src/audio/NoAudio.hpp
index 3029adea..f14ee1c2 100644
--- a/src/audio/NoAudio.h
+++ b/src/audio/NoAudio.hpp
@@ -1,7 +1,7 @@
-#ifndef AUDIO_NOAUDIO_H_
-#define AUDIO_NOAUDIO_H_
+#ifndef AUDIO_NOAUDIO_HPP_
+#define AUDIO_NOAUDIO_HPP_
 
-#include "audio.h"
+#include "audio.hpp"
 
 namespace audio {
     class NoSound : public Sound {
@@ -85,4 +85,4 @@ namespace audio {
     };
 }
 
-#endif // AUDIO_NOAUDIO_H_
+#endif // AUDIO_NOAUDIO_HPP_
diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index f666bc19..27ac9de1 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -1,14 +1,14 @@
-#include "audio.h"
+#include "audio.hpp"
+
+#include "NoAudio.hpp"
+#include "AL/ALAudio.hpp"
+
+#include "../coders/wav.hpp"
+#include "../coders/ogg.hpp"
 
 #include <iostream>
 #include <stdexcept>
 
-#include "NoAudio.h"
-#include "AL/ALAudio.h"
-
-#include "../coders/wav.h"
-#include "../coders/ogg.h"
-
 namespace audio {
     static speakerid_t nextId = 1;
     static Backend* backend;
diff --git a/src/audio/audio.h b/src/audio/audio.hpp
similarity index 99%
rename from src/audio/audio.h
rename to src/audio/audio.hpp
index cb0d5358..42f19c2a 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.hpp
@@ -1,11 +1,12 @@
-#ifndef AUDIO_AUDIO_H_
-#define AUDIO_AUDIO_H_
+#ifndef AUDIO_AUDIO_HPP_
+#define AUDIO_AUDIO_HPP_
+
+#include "../typedefs.h"
 
 #include <vector>
 #include <memory>
 #include <filesystem>
 #include <glm/glm.hpp>
-#include "../typedefs.h"
 
 namespace fs = std::filesystem;
 
@@ -512,4 +513,4 @@ namespace audio {
     void close();
 };
 
-#endif // AUDIO_AUDIO_H_
+#endif // AUDIO_AUDIO_HPP_
diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp
index c549b61a..88262309 100644
--- a/src/coders/ogg.cpp
+++ b/src/coders/ogg.cpp
@@ -1,12 +1,14 @@
-#include "ogg.h"
+#include "ogg.hpp"
+
+#include "../debug/Logger.hpp"
+#include "../audio/audio.hpp"
+#include "../typedefs.h"
 
 #include <string>
-#include <iostream>
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-#include "../audio/audio.h"
-#include "../typedefs.h"
+static debug::Logger logger("ogg");
 
 using namespace audio;
 
@@ -56,7 +58,7 @@ audio::PCM* ogg::load_pcm(const std::filesystem::path& file, bool headerOnly) {
             if (ret == 0) {
                 eof = true;
             } else if (ret < 0) {
-                std::cerr << "ogg::load_pcm: " << vorbis_error_message(ret) << std::endl;
+                logger.error() << "ogg::load_pcm: " << vorbis_error_message(ret);
             } else {
                 data.insert(data.end(), std::begin(buffer), std::begin(buffer)+ret);
             }
@@ -98,7 +100,7 @@ public:
         int bitstream = 0;
         long bytes = ov_read(&vf, buffer, bufferSize, 0, 2, true, &bitstream);
         if (bytes < 0) {
-            std::cerr << "ogg::load_pcm: " << vorbis_error_message(bytes) << " " << bytes << std::endl;
+            logger.error() << "ogg::load_pcm: " << vorbis_error_message(bytes) << " " << bytes;
             return PCMStream::ERROR;
         }
         return bytes;
diff --git a/src/coders/ogg.h b/src/coders/ogg.hpp
similarity index 74%
rename from src/coders/ogg.h
rename to src/coders/ogg.hpp
index 828f2be5..fd0b69ce 100644
--- a/src/coders/ogg.h
+++ b/src/coders/ogg.hpp
@@ -1,5 +1,5 @@
-#ifndef CODERS_OGG_H_
-#define CODERS_OGG_H_
+#ifndef CODERS_OGG_HPP_
+#define CODERS_OGG_HPP_
 
 #include <filesystem>
 
@@ -13,4 +13,4 @@ namespace ogg {
     extern audio::PCMStream* create_stream(const std::filesystem::path& file);
 }
 
-#endif // CODERS_OGG_H_
+#endif // CODERS_OGG_HPP_
diff --git a/src/coders/wav.cpp b/src/coders/wav.cpp
index 19a4233b..ac45ee32 100644
--- a/src/coders/wav.cpp
+++ b/src/coders/wav.cpp
@@ -1,4 +1,6 @@
-#include "wav.h"
+#include "wav.hpp"
+
+#include "../audio/audio.hpp"
 
 #include <vector>
 #include <string>
@@ -7,8 +9,6 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "../audio/audio.h"
-
 bool is_big_endian() {
     uint32_t ui32_v = 0x01020304;
     char bytes[sizeof(uint32_t)];
diff --git a/src/coders/wav.h b/src/coders/wav.hpp
similarity index 78%
rename from src/coders/wav.h
rename to src/coders/wav.hpp
index 5a8a2095..be648535 100644
--- a/src/coders/wav.h
+++ b/src/coders/wav.hpp
@@ -1,5 +1,5 @@
-#ifndef CODERS_WAV_H_
-#define CODERS_WAV_H_
+#ifndef CODERS_WAV_HPP_
+#define CODERS_WAV_HPP_
 
 #include <filesystem>
 
@@ -13,4 +13,4 @@ namespace wav {
     extern audio::PCMStream* create_stream(const std::filesystem::path& file);
 }
 
-#endif // CODERS_WAV_H_
+#endif // CODERS_WAV_HPP_
diff --git a/src/coders/xml.cpp b/src/coders/xml.cpp
index 68153311..c5c71e35 100644
--- a/src/coders/xml.cpp
+++ b/src/coders/xml.cpp
@@ -1,9 +1,10 @@
-#include "xml.h"
+#include "xml.hpp"
+
+#include "../util/stringutil.h"
 
 #include <charconv>
 #include <stdexcept>
 #include <sstream>
-#include "../util/stringutil.h"
 
 using namespace xml;
 
diff --git a/src/coders/xml.h b/src/coders/xml.hpp
similarity index 95%
rename from src/coders/xml.h
rename to src/coders/xml.hpp
index b04c8c8e..fc610c46 100644
--- a/src/coders/xml.h
+++ b/src/coders/xml.hpp
@@ -1,5 +1,5 @@
-#ifndef CODERS_XML_H_
-#define CODERS_XML_H_
+#ifndef CODERS_XML_HPP_
+#define CODERS_XML_HPP_
 
 #include <string>
 #include <memory>
@@ -141,4 +141,4 @@ namespace xml {
     extern xmldocument parse(std::string filename, std::string source);
 }
 
-#endif // CODERS_XML_H_
+#endif // CODERS_XML_HPP_
diff --git a/src/engine.cpp b/src/engine.cpp
index 19542eee..d9ca663e 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -4,7 +4,7 @@
 
 #include "debug/Logger.hpp"
 #include "assets/AssetsLoader.h"
-#include "audio/audio.h"
+#include "audio/audio.hpp"
 #include "coders/GLSLExtension.h"
 #include "coders/imageio.hpp"
 #include "coders/json.h"
@@ -42,8 +42,6 @@
 
 static debug::Logger logger("engine");
 
-
-
 namespace fs = std::filesystem;
 
 void addWorldGenerators() {
@@ -64,7 +62,6 @@ Engine::Engine(EngineSettings& settings, SettingsHandler& settingsHandler, Engin
     : settings(settings), settingsHandler(settingsHandler), paths(paths) 
 {
     corecontent::setup_bindings();
-
     loadSettings();
 
     controller = std::make_unique<EngineController>(this);
diff --git a/src/frontend/ContentGfxCache.cpp b/src/frontend/ContentGfxCache.cpp
index 8dbf3e98..999b337e 100644
--- a/src/frontend/ContentGfxCache.cpp
+++ b/src/frontend/ContentGfxCache.cpp
@@ -1,6 +1,4 @@
-#include "ContentGfxCache.h"
-
-#include <string>
+#include "ContentGfxCache.hpp"
 
 #include "../assets/Assets.h"
 #include "../content/Content.h"
@@ -9,7 +7,9 @@
 #include "../graphics/core/Atlas.hpp"
 #include "../maths/UVRegion.hpp"
 #include "../voxels/Block.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
+
+#include <string>
 
 ContentGfxCache::ContentGfxCache(const Content* content, Assets* assets) : content(content) {
     auto indices = content->getIndices();
diff --git a/src/frontend/ContentGfxCache.h b/src/frontend/ContentGfxCache.hpp
similarity index 80%
rename from src/frontend/ContentGfxCache.h
rename to src/frontend/ContentGfxCache.hpp
index a34d0c92..182e3296 100644
--- a/src/frontend/ContentGfxCache.h
+++ b/src/frontend/ContentGfxCache.hpp
@@ -1,5 +1,5 @@
-#ifndef FRONTEND_BLOCKS_GFX_CACHE_H_
-#define FRONTEND_BLOCKS_GFX_CACHE_H_
+#ifndef FRONTEND_BLOCKS_GFX_CACHE_HPP_
+#define FRONTEND_BLOCKS_GFX_CACHE_HPP_
 
 #include "../typedefs.h"
 
@@ -24,4 +24,4 @@ public:
     const Content* getContent() const;
 };
 
-#endif // FRONTEND_BLOCKS_GFX_CACHE_H_
+#endif // FRONTEND_BLOCKS_GFX_CACHE_HPP_
diff --git a/src/frontend/LevelFrontend.cpp b/src/frontend/LevelFrontend.cpp
index 0f3163b9..1713dd80 100644
--- a/src/frontend/LevelFrontend.cpp
+++ b/src/frontend/LevelFrontend.cpp
@@ -1,7 +1,7 @@
 #include "LevelFrontend.h"
 
 #include "../assets/Assets.h"
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../content/Content.h"
 #include "../graphics/core/Atlas.hpp"
 #include "../graphics/render/BlocksPreview.hpp"
@@ -9,7 +9,7 @@
 #include "../logic/PlayerController.h"
 #include "../voxels/Block.h"
 #include "../world/Level.h"
-#include "ContentGfxCache.h"
+#include "ContentGfxCache.hpp"
 
 LevelFrontend::LevelFrontend(LevelController* controller, Assets* assets) 
   : level(controller->getLevel()),
diff --git a/src/frontend/UiDocument.cpp b/src/frontend/UiDocument.cpp
index 000d2fa8..d1e5f6e1 100644
--- a/src/frontend/UiDocument.cpp
+++ b/src/frontend/UiDocument.cpp
@@ -1,4 +1,4 @@
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 #include "../files/files.h"
 #include "../graphics/ui/elements/UINode.hpp"
diff --git a/src/frontend/UiDocument.h b/src/frontend/UiDocument.hpp
similarity index 88%
rename from src/frontend/UiDocument.h
rename to src/frontend/UiDocument.hpp
index 57d0b8c2..d2d38884 100644
--- a/src/frontend/UiDocument.h
+++ b/src/frontend/UiDocument.hpp
@@ -1,5 +1,5 @@
-#ifndef FRONTEND_UI_DOCUMENT_H_
-#define FRONTEND_UI_DOCUMENT_H_
+#ifndef FRONTEND_UI_DOCUMENT_HPP_
+#define FRONTEND_UI_DOCUMENT_HPP_
 
 #include "../typedefs.h"
 
@@ -50,4 +50,4 @@ public:
     static std::shared_ptr<gui::UINode> readElement(fs::path file);
 };
 
-#endif // FRONTEND_UI_DOCUMENT_H_
+#endif // FRONTEND_UI_DOCUMENT_HPP_
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index a284a15a..31cb5247 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -1,8 +1,4 @@
-#include <string>
-#include <memory>
-#include <sstream>
-
-#include "../audio/audio.h"
+#include "../audio/audio.hpp"
 #include "../delegates.h"
 #include "../engine.h"
 #include "../graphics/core/Mesh.hpp"
@@ -20,6 +16,10 @@
 #include "../world/Level.h"
 #include "../world/World.h"
 
+#include <string>
+#include <memory>
+#include <sstream>
+
 using namespace gui;
 
 static std::shared_ptr<Label> create_label(wstringsupplier supplier) {
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index e649f5f5..974ae8d9 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -1,4 +1,4 @@
-#include "hud.h"
+#include "hud.hpp"
 
 #include "../assets/Assets.h"
 #include "../content/Content.h"
@@ -39,9 +39,9 @@
 #include "../window/Window.hpp"
 #include "../world/Level.h"
 #include "../world/World.h"
-#include "ContentGfxCache.h"
+#include "ContentGfxCache.hpp"
 #include "LevelFrontend.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 #include <assert.h>
 #include <memory>
diff --git a/src/frontend/hud.h b/src/frontend/hud.hpp
similarity index 98%
rename from src/frontend/hud.h
rename to src/frontend/hud.hpp
index e747f1a6..2cf3f59b 100644
--- a/src/frontend/hud.h
+++ b/src/frontend/hud.hpp
@@ -1,5 +1,5 @@
-#ifndef FRONTEND_HUD_H_
-#define FRONTEND_HUD_H_
+#ifndef FRONTEND_HUD_HPP_
+#define FRONTEND_HUD_HPP_
 
 #include "../typedefs.h"
 #include "../util/ObjectsKeeper.hpp"
@@ -164,4 +164,4 @@ public:
     std::shared_ptr<Inventory> getBlockInventory();
 };
 
-#endif // FRONTEND_HUD_H_
+#endif // FRONTEND_HUD_HPP_
diff --git a/src/frontend/menu.cpp b/src/frontend/menu.cpp
index 1917ed21..54bcca68 100644
--- a/src/frontend/menu.cpp
+++ b/src/frontend/menu.cpp
@@ -17,7 +17,7 @@
 #include "../util/stringutil.h"
 #include "../window/Window.hpp"
 #include "locale/langs.h"
-#include "UiDocument.h"
+#include "UiDocument.hpp"
 
 namespace fs = std::filesystem;
 using namespace gui;
diff --git a/src/frontend/screens/LevelScreen.cpp b/src/frontend/screens/LevelScreen.cpp
index 3d402ef3..500fa1ae 100644
--- a/src/frontend/screens/LevelScreen.cpp
+++ b/src/frontend/screens/LevelScreen.cpp
@@ -1,9 +1,9 @@
 #include "LevelScreen.hpp"
 
-#include "../hud.h"
+#include "../hud.hpp"
 #include "../LevelFrontend.h"
 #include "../../debug/Logger.hpp"
-#include "../../audio/audio.h"
+#include "../../audio/audio.hpp"
 #include "../../coders/imageio.hpp"
 #include "../../graphics/core/PostProcessing.h"
 #include "../../graphics/core/DrawContext.hpp"
diff --git a/src/graphics/render/BlocksPreview.cpp b/src/graphics/render/BlocksPreview.cpp
index 9ee4d797..6c2b1e87 100644
--- a/src/graphics/render/BlocksPreview.cpp
+++ b/src/graphics/render/BlocksPreview.cpp
@@ -1,8 +1,9 @@
 #include "BlocksPreview.hpp"
+
 #include "../../assets/Assets.h"
 #include "../../constants.h"
 #include "../../content/Content.h"
-#include "../../frontend/ContentGfxCache.h"
+#include "../../frontend/ContentGfxCache.hpp"
 #include "../../voxels/Block.h"
 #include "../../window/Camera.hpp"
 #include "../../window/Window.hpp"
diff --git a/src/graphics/render/BlocksRenderer.cpp b/src/graphics/render/BlocksRenderer.cpp
index 02860e8d..8268e6b9 100644
--- a/src/graphics/render/BlocksRenderer.cpp
+++ b/src/graphics/render/BlocksRenderer.cpp
@@ -1,4 +1,5 @@
 #include "BlocksRenderer.hpp"
+
 #include "../core/Mesh.hpp"
 #include "../../maths/UVRegion.hpp"
 #include "../../constants.h"
@@ -8,7 +9,7 @@
 #include "../../voxels/VoxelsVolume.h"
 #include "../../voxels/ChunksStorage.h"
 #include "../../lighting/Lightmap.h"
-#include "../../frontend/ContentGfxCache.h"
+#include "../../frontend/ContentGfxCache.hpp"
 #include "../../settings.h"
 
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp
index 35337ef7..af220fff 100644
--- a/src/graphics/ui/GUI.cpp
+++ b/src/graphics/ui/GUI.cpp
@@ -6,7 +6,7 @@
 #include <algorithm>
 
 #include "../../assets/Assets.h"
-#include "../../frontend/UiDocument.h"
+#include "../../frontend/UiDocument.hpp"
 #include "../../graphics/core/Batch2D.hpp"
 #include "../../graphics/core/Shader.hpp"
 #include "../../graphics/core/DrawContext.hpp"
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index 6f2d572b..b93e5a81 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -533,9 +533,13 @@ void UiXmlReader::addIgnore(const std::string& tag) {
 std::shared_ptr<UINode> UiXmlReader::readUINode(xml::xmlelement element) {
     if (element->has("if")) {
         const auto& cond = element->attr("if").getText();
-        if (cond.empty() || cond == "false" || cond == "nil") {
+        if (cond.empty() || cond == "false" || cond == "nil")
+            return nullptr;
+    }
+    if (element->has("ifnot")) {
+        const auto& cond = element->attr("ifnot").getText();
+        if (!(cond.empty() || cond == "false" || cond == "nil"))
             return nullptr;
-        }
     }
 
     const std::string& tag = element->getTag();
diff --git a/src/graphics/ui/gui_xml.hpp b/src/graphics/ui/gui_xml.hpp
index b7c42284..55cbf17a 100644
--- a/src/graphics/ui/gui_xml.hpp
+++ b/src/graphics/ui/gui_xml.hpp
@@ -1,14 +1,14 @@
 #ifndef FRONTEND_GUI_GUI_XML_HPP_
 #define FRONTEND_GUI_GUI_XML_HPP_
 
+#include "GUI.hpp"
+#include "../../coders/xml.hpp"
+
 #include <memory>
 #include <stack>
 #include <unordered_set>
 #include <unordered_map>
 
-#include "GUI.hpp"
-#include "../../coders/xml.h"
-
 namespace gui {
     class UiXmlReader;
 
diff --git a/src/logic/scripting/lua/LuaState.cpp b/src/logic/scripting/lua/LuaState.cpp
index 7d877aca..dd7c468e 100644
--- a/src/logic/scripting/lua/LuaState.cpp
+++ b/src/logic/scripting/lua/LuaState.cpp
@@ -1,11 +1,12 @@
-#include "LuaState.h"
+#include "LuaState.hpp"
+
+#include "lua_util.hpp"
+#include "api_lua.hpp"
+#include "../../../debug/Logger.hpp"
+#include "../../../util/stringutil.h"
 
 #include <iomanip>
 #include <iostream>
-#include "lua_util.h"
-#include "api_lua.h"
-#include "../../../debug/Logger.hpp"
-#include "../../../util/stringutil.h"
 
 inline std::string LAMBDAS_TABLE = "$L";
 
diff --git a/src/logic/scripting/lua/LuaState.h b/src/logic/scripting/lua/LuaState.hpp
similarity index 94%
rename from src/logic/scripting/lua/LuaState.h
rename to src/logic/scripting/lua/LuaState.hpp
index 63b68e4c..2a153e41 100644
--- a/src/logic/scripting/lua/LuaState.h
+++ b/src/logic/scripting/lua/LuaState.hpp
@@ -1,9 +1,7 @@
-#ifndef LOGIC_SCRIPTING_LUA_STATE_H_
-#define LOGIC_SCRIPTING_LUA_STATE_H_
+#ifndef LOGIC_SCRIPTING_LUA_STATE_HPP_
+#define LOGIC_SCRIPTING_LUA_STATE_HPP_
 
-#include "lua_commons.h"
-#include <string>
-#include <stdexcept>
+#include "lua_commons.hpp"
 
 #include "../../../data/dynamic.h"
 #include "../../../delegates.h"
@@ -12,6 +10,9 @@
 #error LuaJIT required
 #endif
 
+#include <string>
+#include <stdexcept>
+
 namespace lua {
     class luaerror : public std::runtime_error {
     public:
@@ -76,4 +77,4 @@ namespace lua {
     };
 }
 
-#endif // LOGIC_SCRIPTING_LUA_STATE_H_
+#endif // LOGIC_SCRIPTING_LUA_STATE_HPP_
diff --git a/src/logic/scripting/lua/api_lua.h b/src/logic/scripting/lua/api_lua.hpp
similarity index 80%
rename from src/logic/scripting/lua/api_lua.h
rename to src/logic/scripting/lua/api_lua.hpp
index 012283fd..0650fb2d 100644
--- a/src/logic/scripting/lua/api_lua.h
+++ b/src/logic/scripting/lua/api_lua.hpp
@@ -1,8 +1,9 @@
-#ifndef LOGIC_SCRIPTING_API_LUA_H_
-#define LOGIC_SCRIPTING_API_LUA_H_
+#ifndef LOGIC_SCRIPTING_API_LUA_HPP_
+#define LOGIC_SCRIPTING_API_LUA_HPP_
+
+#include "lua_commons.hpp"
 
 #include <exception>
-#include "lua_commons.h"
  
 // Libraries
 extern const luaL_Reg audiolib [];
@@ -23,4 +24,4 @@ extern const luaL_Reg inputlib [];
 // Lua Overrides
 extern int l_print(lua_State* L);
 
-#endif // LOGIC_SCRIPTING_API_LUA_H_
+#endif // LOGIC_SCRIPTING_API_LUA_HPP_
diff --git a/src/logic/scripting/lua/libaudio.cpp b/src/logic/scripting/lua/libaudio.cpp
index 19c7975a..cca57037 100644
--- a/src/logic/scripting/lua/libaudio.cpp
+++ b/src/logic/scripting/lua/libaudio.cpp
@@ -1,8 +1,8 @@
-#include "api_lua.h"
-#include "lua_commons.h"
-#include "lua_util.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
+#include "lua_util.hpp"
 
-#include "../../../audio/audio.h"
+#include "../../../audio/audio.hpp"
 #include "../../../engine.h"
 #include "../scripting.h"
 
diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp
index 85c56240..dc446b7e 100644
--- a/src/logic/scripting/lua/libblock.cpp
+++ b/src/logic/scripting/lua/libblock.cpp
@@ -1,6 +1,6 @@
-#include "lua_commons.h"
-#include "api_lua.h"
-#include "lua_util.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
+#include "lua_util.hpp"
 #include "../scripting.h"
 #include "../../../world/Level.h"
 #include "../../../voxels/Chunks.h"
diff --git a/src/logic/scripting/lua/libcore.cpp b/src/logic/scripting/lua/libcore.cpp
index 667ebad8..cbe971b5 100644
--- a/src/logic/scripting/lua/libcore.cpp
+++ b/src/logic/scripting/lua/libcore.cpp
@@ -1,6 +1,6 @@
-#include "lua_commons.h"
-#include "api_lua.h"
-#include "LuaState.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
+#include "LuaState.hpp"
 
 #include "../../../engine.h"
 #include "../../../files/settings_io.hpp"
diff --git a/src/logic/scripting/lua/libfile.cpp b/src/logic/scripting/lua/libfile.cpp
index 00505141..538b2894 100644
--- a/src/logic/scripting/lua/libfile.cpp
+++ b/src/logic/scripting/lua/libfile.cpp
@@ -1,5 +1,5 @@
-#include "lua_commons.h"
-#include "api_lua.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
 #include "../scripting.h"
 #include "../../../engine.h"
 #include "../../../files/files.h"
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 0eb44948..77adf8a9 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -1,11 +1,9 @@
-#include "lua_commons.h"
-#include "api_lua.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
+#include "lua_util.hpp"
+#include "LuaState.hpp"
 
-#include <iostream>
 #include "../scripting.h"
-#include "lua_util.h"
-#include "LuaState.h"
-
 #include "../../../engine.h"
 #include "../../../assets/Assets.h"
 #include "../../../items/Inventories.h"
@@ -18,7 +16,7 @@
 #include "../../../graphics/ui/elements/Panel.hpp"
 #include "../../../graphics/ui/elements/Menu.hpp"
 #include "../../../graphics/ui/elements/InventoryView.hpp"
-#include "../../../frontend/UiDocument.h"
+#include "../../../frontend/UiDocument.hpp"
 #include "../../../frontend/locale/langs.h"
 #include "../../../util/stringutil.h"
 #include "../../../world/Level.h"
diff --git a/src/logic/scripting/lua/libhud.cpp b/src/logic/scripting/lua/libhud.cpp
index 9efb0a14..70f724d3 100644
--- a/src/logic/scripting/lua/libhud.cpp
+++ b/src/logic/scripting/lua/libhud.cpp
@@ -1,11 +1,12 @@
-#include "lua_commons.h"
-#include "api_lua.h"
-#include "LuaState.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
+#include "LuaState.hpp"
+
 #include "../../../assets/Assets.h"
 #include "../../../content/Content.h"
 #include "../../../engine.h"
-#include "../../../frontend/hud.h"
-#include "../../../frontend/UiDocument.h"
+#include "../../../frontend/hud.hpp"
+#include "../../../frontend/UiDocument.hpp"
 #include "../../../graphics/ui/elements/InventoryView.hpp"
 #include "../../../items/Inventories.h"
 #include "../../../logic/BlocksController.h"
diff --git a/src/logic/scripting/lua/libinput.cpp b/src/logic/scripting/lua/libinput.cpp
index 4aeb6561..4291c6f5 100644
--- a/src/logic/scripting/lua/libinput.cpp
+++ b/src/logic/scripting/lua/libinput.cpp
@@ -1,15 +1,14 @@
-#include "api_lua.h"
-#include "lua_commons.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
+#include "LuaState.hpp"
 #include "../scripting.h"
 
 #include "../../../window/input.hpp"
 #include "../../../window/Events.hpp"
 #include "../../../frontend/screens/Screen.hpp"
-#include "../../../frontend/hud.h"
+#include "../../../frontend/hud.hpp"
 #include "../../../engine.h"
 
-#include "LuaState.h"
-
 namespace scripting {
     extern lua::LuaState* state;
     extern Hud* hud;
diff --git a/src/logic/scripting/lua/libinventory.cpp b/src/logic/scripting/lua/libinventory.cpp
index 83b3d98c..73384506 100644
--- a/src/logic/scripting/lua/libinventory.cpp
+++ b/src/logic/scripting/lua/libinventory.cpp
@@ -1,7 +1,6 @@
-#include "lua_commons.h"
-#include "api_lua.h"
-
-#include "lua_util.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
+#include "lua_util.hpp"
 #include "../scripting.h"
 #include "../../../content/Content.h"
 #include "../../../world/Level.h"
diff --git a/src/logic/scripting/lua/libitem.cpp b/src/logic/scripting/lua/libitem.cpp
index 2d1451f2..1eaa88d3 100644
--- a/src/logic/scripting/lua/libitem.cpp
+++ b/src/logic/scripting/lua/libitem.cpp
@@ -1,5 +1,5 @@
-#include "lua_commons.h"
-#include "api_lua.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
 #include "../scripting.h"
 #include "../../../content/Content.h"
 #include "../../../items/ItemDef.h"
diff --git a/src/logic/scripting/lua/libjson.cpp b/src/logic/scripting/lua/libjson.cpp
index 6240fe4f..a4ad9221 100644
--- a/src/logic/scripting/lua/libjson.cpp
+++ b/src/logic/scripting/lua/libjson.cpp
@@ -1,7 +1,6 @@
-#include "api_lua.h"
-#include "lua_commons.h"
-
-#include "LuaState.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
+#include "LuaState.hpp"
 
 #include "../../../coders/json.h"
 #include "../../../data/dynamic.h"
diff --git a/src/logic/scripting/lua/libpack.cpp b/src/logic/scripting/lua/libpack.cpp
index efb12c77..bc5a4c1f 100644
--- a/src/logic/scripting/lua/libpack.cpp
+++ b/src/logic/scripting/lua/libpack.cpp
@@ -1,5 +1,5 @@
-#include "api_lua.h"
-#include "lua_commons.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
 #include "../scripting.h"
 #include "../../../engine.h"
 #include "../../../assets/AssetsLoader.h"
diff --git a/src/logic/scripting/lua/libplayer.cpp b/src/logic/scripting/lua/libplayer.cpp
index ea4c6211..50e15c90 100644
--- a/src/logic/scripting/lua/libplayer.cpp
+++ b/src/logic/scripting/lua/libplayer.cpp
@@ -1,5 +1,5 @@
-#include "lua_commons.h"
-#include "api_lua.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
 #include "../scripting.h"
 #include "../../../world/Level.h"
 #include "../../../objects/Player.h"
diff --git a/src/logic/scripting/lua/libtime.cpp b/src/logic/scripting/lua/libtime.cpp
index f6419af7..9c463214 100644
--- a/src/logic/scripting/lua/libtime.cpp
+++ b/src/logic/scripting/lua/libtime.cpp
@@ -1,5 +1,5 @@
-#include "api_lua.h"
-#include "lua_commons.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
 #include "../scripting.h"
 #include "../../../engine.h"
 #include "../../../window/Window.hpp"
diff --git a/src/logic/scripting/lua/libworld.cpp b/src/logic/scripting/lua/libworld.cpp
index 7d252461..b753b0bc 100644
--- a/src/logic/scripting/lua/libworld.cpp
+++ b/src/logic/scripting/lua/libworld.cpp
@@ -1,5 +1,5 @@
-#include "lua_commons.h"
-#include "api_lua.h"
+#include "lua_commons.hpp"
+#include "api_lua.hpp"
 #include "../scripting.h"
 #include "../../../assets/Assets.h"
 #include "../../../assets/AssetsLoader.h"
diff --git a/src/logic/scripting/lua/lua_commons.h b/src/logic/scripting/lua/lua_commons.hpp
similarity index 85%
rename from src/logic/scripting/lua/lua_commons.h
rename to src/logic/scripting/lua/lua_commons.hpp
index 150ef567..84772d38 100644
--- a/src/logic/scripting/lua/lua_commons.h
+++ b/src/logic/scripting/lua/lua_commons.hpp
@@ -1,5 +1,5 @@
-#ifndef LOGIC_SCRIPTING_LUA_H_
-#define LOGIC_SCRIPTING_LUA_H_
+#ifndef LOGIC_SCRIPTING_LUA_HPP_
+#define LOGIC_SCRIPTING_LUA_HPP_
 
 #ifdef __linux__ 
 #include <luajit-2.1/luaconf.h>
@@ -30,4 +30,4 @@ template <lua_CFunction func> int lua_wrap_errors(lua_State *L) {
     return result;
 }
 
-#endif // LOGIC_SCRIPTING_LUA_H_
+#endif // LOGIC_SCRIPTING_LUA_HPP_
diff --git a/src/logic/scripting/lua/lua_overrides.cpp b/src/logic/scripting/lua/lua_overrides.cpp
index 20ef61a5..5d68967b 100644
--- a/src/logic/scripting/lua/lua_overrides.cpp
+++ b/src/logic/scripting/lua/lua_overrides.cpp
@@ -1,5 +1,5 @@
-#include "api_lua.h"
-#include "lua_commons.h"
+#include "api_lua.hpp"
+#include "lua_commons.hpp"
 
 #include <iostream>
 
diff --git a/src/logic/scripting/lua/lua_util.h b/src/logic/scripting/lua/lua_util.hpp
similarity index 99%
rename from src/logic/scripting/lua/lua_util.h
rename to src/logic/scripting/lua/lua_util.hpp
index d77bcec8..5f55ca27 100644
--- a/src/logic/scripting/lua/lua_util.h
+++ b/src/logic/scripting/lua/lua_util.hpp
@@ -1,6 +1,8 @@
 #ifndef LOGIC_SCRIPTING_LUA_UTIL_H_
 #define LOGIC_SCRIPTING_LUA_UTIL_H_
 
+#include "LuaState.hpp"
+
 #ifdef __linux__ 
 #include <luajit-2.1/luaconf.h>
 #include <luajit-2.1/lua.hpp>
@@ -8,7 +10,6 @@
 #include <lua.hpp>
 #endif
 #include <glm/glm.hpp>
-#include "LuaState.h"
 
 namespace lua {
     inline int pushivec3(lua_State* L, luaint x, luaint y, luaint z) {
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index 9a2b7e91..674205dc 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -1,26 +1,26 @@
 #include "scripting.h"
 
+#include "../../content/ContentPack.h"
+#include "../../debug/Logger.hpp"
+#include "../../engine.h"
+#include "../../files/engine_paths.h"
+#include "../../files/files.h"
+#include "../../frontend/UiDocument.hpp"
+#include "../../items/Inventory.h"
+#include "../../items/ItemDef.h"
+#include "../../logic/BlocksController.h"
+#include "../../logic/LevelController.h"
+#include "../../objects/Player.h"
+#include "../../util/stringutil.h"
+#include "../../util/timeutil.h"
+#include "../../util/timeutil.h"
+#include "../../voxels/Block.h"
+#include "../../world/Level.h"
+#include "lua/LuaState.hpp"
+
 #include <iostream>
 #include <stdexcept>
 
-#include "../../debug/Logger.hpp"
-#include "../../content/ContentPack.h"
-#include "../../files/engine_paths.h"
-#include "../../files/files.h"
-#include "../../util/timeutil.h"
-#include "../../world/Level.h"
-#include "../../objects/Player.h"
-#include "../../voxels/Block.h"
-#include "../../items/ItemDef.h"
-#include "../../items/Inventory.h"
-#include "../../logic/BlocksController.h"
-#include "../../logic/LevelController.h"
-#include "../../frontend/UiDocument.h"
-#include "../../engine.h"
-#include "lua/LuaState.h"
-#include "../../util/stringutil.h"
-#include "../../util/timeutil.h"
-
 using namespace scripting;
 
 namespace scripting {
diff --git a/src/logic/scripting/scripting_functional.cpp b/src/logic/scripting/scripting_functional.cpp
index a64a27d7..6e71376e 100644
--- a/src/logic/scripting/scripting_functional.cpp
+++ b/src/logic/scripting/scripting_functional.cpp
@@ -1,8 +1,6 @@
 #include "scripting_functional.h"
 
-#include <iostream>
-
-#include "lua/LuaState.h"
+#include "lua/LuaState.hpp"
 #include "../../debug/Logger.hpp"
 #include "../../util/stringutil.h"
 
diff --git a/src/logic/scripting/scripting_hud.cpp b/src/logic/scripting/scripting_hud.cpp
index 994961d2..043d9770 100644
--- a/src/logic/scripting/scripting_hud.cpp
+++ b/src/logic/scripting/scripting_hud.cpp
@@ -1,17 +1,15 @@
 #include "scripting_hud.hpp"
 #include "scripting.h"
 
-#include "lua/api_lua.h"
-#include "lua/LuaState.h"
+#include "lua/api_lua.hpp"
+#include "lua/LuaState.hpp"
 
 #include "../../debug/Logger.hpp"
-#include "../../frontend/hud.h"
+#include "../../frontend/hud.hpp"
 #include "../../objects/Player.h"
 #include "../../files/files.h"
 #include "../../engine.h"
 
-#include <iostream>
-
 namespace scripting {
     extern lua::LuaState* state;
 }