diff --git a/src/WallpaperEngine/Application/CApplicationContext.cpp b/src/WallpaperEngine/Application/CApplicationContext.cpp
index 72b0e62..ebe2c14 100644
--- a/src/WallpaperEngine/Application/CApplicationContext.cpp
+++ b/src/WallpaperEngine/Application/CApplicationContext.cpp
@@ -4,9 +4,8 @@
 #include "WallpaperEngine/Logging/CLog.h"
 
 #include <cstring>
-#include <getopt.h>
-#include <glm/common.hpp>
 #include <string>
+#include <getopt.h>
 
 #define WORKSHOP_APP_ID 431960
 #define APP_DIRECTORY "wallpaper_engine"
@@ -14,23 +13,23 @@
 using namespace WallpaperEngine::Application;
 
 struct option long_options [] = {
-    {"screen-root",     required_argument, nullptr, 'r'},
-    {"pkg",             required_argument, nullptr, 'p'},
-    {"dir",             required_argument, nullptr, 'd'},
-    {"silent",          no_argument,       nullptr, 's'},
-    {"volume",          required_argument, nullptr, 'v'},
-    {"help",            no_argument,       nullptr, 'h'},
-    {"fps",             required_argument, nullptr, 'f'},
-    {"assets-dir",      required_argument, nullptr, 'a'},
-    {"screenshot",      required_argument, nullptr, 'c'},
-    {"list-properties", no_argument,       nullptr, 'l'},
-    {"set-property",    required_argument, nullptr, 'o'},
-    {nullptr,                           0, nullptr,   0}
+    {"screen-root",     required_argument, 0, 'r'},
+    {"pkg",             required_argument, 0, 'p'},
+    {"dir",             required_argument, 0, 'd'},
+    {"silent",          no_argument,       0, 's'},
+    {"volume",          required_argument, 0, 'v'},
+    {"help",            no_argument,       0, 'h'},
+    {"fps",             required_argument, 0, 'f'},
+    {"assets-dir",      required_argument, 0, 'a'},
+    {"screenshot",      required_argument, 0, 'c'},
+    {"list-properties", no_argument,       0, 'l'},
+    {"set-property",    required_argument, 0, 'o'},
+    {nullptr,                           0, 0,   0}
 };
 
 std::string stringPathFixes(const std::string& s)
 {
-    if (s.empty ())
+    if (s.empty () == true)
         return s;
 
     std::string str (s);
@@ -49,8 +48,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[]) :
     maximumFPS (30),
     audioVolume (128),
     audioEnabled (true),
-    onlyListProperties (false),
-	screenshotFormat (FIF_UNKNOWN)
+    onlyListProperties (false)
 {
     int c;
 
@@ -97,7 +95,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[]) :
                 break;
 
             case 'f':
-                maximumFPS = strtol (optarg, nullptr, 0);
+                maximumFPS = atoi (optarg);
                 break;
 
             case 'a':
@@ -105,20 +103,17 @@ CApplicationContext::CApplicationContext (int argc, char* argv[]) :
                 break;
 
             case 'v':
-                this->audioVolume = glm::clamp ((int) strtol (optarg, nullptr, 0), 0, 128);
+                this->audioVolume = std::max (atoi (optarg), 128);
                 break;
 
             case 'c':
                 this->takeScreenshot = true;
                 this->screenshot = stringPathFixes (optarg);
                 break;
-
-			default:
-				break;
         }
     }
 
-    if (this->background.empty ())
+    if (this->background.empty () == true)
     {
         if (optind < argc && strlen (argv [optind]) > 0)
         {
@@ -126,7 +121,7 @@ CApplicationContext::CApplicationContext (int argc, char* argv[]) :
         }
         else
         {
-            CApplicationContext::printHelp (argv [0]);
+            this->printHelp (argv [0]);
         }
     }
 
@@ -146,7 +141,7 @@ void CApplicationContext::validatePath ()
 
 void CApplicationContext::validateAssets ()
 {
-    if (!this->assets.empty ())
+    if (this->assets.empty () == false)
     {
         sLog.out ("Using wallpaper engine's assets at ", this->assets, " based on --assets-dir parameter");
         return;
@@ -166,10 +161,10 @@ void CApplicationContext::validateAssets ()
 
 void CApplicationContext::validateScreenshot ()
 {
-    if (!this->takeScreenshot)
+    if (this->takeScreenshot == false)
         return;
 
-    if (!this->screenshot.has_extension ())
+    if (this->screenshot.has_extension () == false)
         sLog.exception ("Cannot determine screenshot format");
 
     std::string extension = this->screenshot.extension ();
@@ -194,7 +189,7 @@ void CApplicationContext::printHelp (const char* route)
     sLog.out ("");
     sLog.out ("options:");
     sLog.out ("\t--silent\t\t\t\t\tMutes all the sound the wallpaper might produce");
-    sLog.out ("\t--volume <amount>\t\t\tSets the volume for all the sounds in the background (0 - 128)");
+    sLog.out ("\t--volume <amount>\t\t\tSets the volume for all the sounds in the background");
     sLog.out ("\t--screen-root <screen name>\tDisplay as screen's background");
     sLog.out ("\t--fps <maximum-fps>\t\t\tLimits the FPS to the given number, useful to keep battery consumption low");
     sLog.out ("\t--assets-dir <path>\t\t\tFolder where the assets are stored");
diff --git a/src/WallpaperEngine/Assets/CTexture.cpp b/src/WallpaperEngine/Assets/CTexture.cpp
index d0ce263..9af11ef 100644
--- a/src/WallpaperEngine/Assets/CTexture.cpp
+++ b/src/WallpaperEngine/Assets/CTexture.cpp
@@ -409,7 +409,7 @@ CTexture::TextureHeader* CTexture::parseHeader (const char* fileData)
             mipmaps.emplace_back (parseMipmap (header, &fileData));
 
         // add the pixmaps back
-        header->images.insert_or_assign (image, mipmaps);
+        header->images.insert (std::pair <uint32_t, std::vector <TextureMipmap*>> (image, mipmaps));
 
         pointer = reinterpret_cast <const uint32_t*> (fileData);
     }
diff --git a/src/WallpaperEngine/Assets/CVirtualContainer.cpp b/src/WallpaperEngine/Assets/CVirtualContainer.cpp
index 475bec7..7849314 100644
--- a/src/WallpaperEngine/Assets/CVirtualContainer.cpp
+++ b/src/WallpaperEngine/Assets/CVirtualContainer.cpp
@@ -7,7 +7,9 @@ using namespace WallpaperEngine::Assets;
 
 void CVirtualContainer::add (const std::string& filename, void* contents, uint32_t length)
 {
-    this->m_virtualFiles.insert_or_assign (filename, CFileEntry (contents, length));
+    this->m_virtualFiles.insert (
+        std::make_pair (filename, CFileEntry (contents, length))
+    );
 }
 
 void CVirtualContainer::add (const std::string& filename, const std::string& contents)
diff --git a/src/WallpaperEngine/Core/CScene.cpp b/src/WallpaperEngine/Core/CScene.cpp
index ba1b4bf..d67a75f 100644
--- a/src/WallpaperEngine/Core/CScene.cpp
+++ b/src/WallpaperEngine/Core/CScene.cpp
@@ -121,7 +121,7 @@ void CScene::insertObject (CObject* object)
     /// TODO: XXXHACK -- TO REMOVE WHEN PARTICLE SUPPORT IS PROPERLY IMPLEMENTED
     if (object != nullptr)
     {
-        this->m_objects.insert_or_assign (object->getId (), object);
+        this->m_objects.insert (std::make_pair (object->getId (), object));
         this->m_objectsByRenderOrder.emplace_back (object);
     }
 }
diff --git a/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp b/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp
index 9902dc5..43da6a3 100644
--- a/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp
+++ b/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp
@@ -57,7 +57,7 @@ void CMaterial::insertPass (Materials::CPass* mass)
 
 void CMaterial::insertTextureBind (Effects::CBind* bind)
 {
-    this->m_textureBindings.insert_or_assign (bind->getIndex (), bind);
+    this->m_textureBindings.insert (std::make_pair (bind->getIndex (), bind));
 }
 
 void CMaterial::setTarget (const std::string& target)
diff --git a/src/WallpaperEngine/Core/Objects/Images/Materials/CPass.cpp b/src/WallpaperEngine/Core/Objects/Images/Materials/CPass.cpp
index 4dfad77..3af142f 100644
--- a/src/WallpaperEngine/Core/Objects/Images/Materials/CPass.cpp
+++ b/src/WallpaperEngine/Core/Objects/Images/Materials/CPass.cpp
@@ -74,7 +74,7 @@ void CPass::insertCombo (const std::string& name, int value)
     std::string uppercase = std::string (name);
 
     std::transform (uppercase.begin (), uppercase.end (), uppercase.begin (), ::toupper);
-    this->m_combos.insert_or_assign (uppercase, value);
+    this->m_combos.insert (std::pair <std::string, int> (uppercase, value));
 }
 
 const std::vector<std::string>& CPass::getTextures () const
@@ -124,5 +124,5 @@ void CPass::setBlendingMode (const std::string& mode)
 
 void CPass::insertConstant (const std::string& name, CShaderConstant* constant)
 {
-    this->m_constants.insert_or_assign (name, constant);
+    this->m_constants.insert (std::pair <std::string, CShaderConstant*> (name, constant));
 }
\ No newline at end of file
diff --git a/src/WallpaperEngine/Render/CScene.cpp b/src/WallpaperEngine/Render/CScene.cpp
index 0856fd4..67c4760 100644
--- a/src/WallpaperEngine/Render/CScene.cpp
+++ b/src/WallpaperEngine/Render/CScene.cpp
@@ -209,7 +209,7 @@ Render::CObject* CScene::createObject (Core::CObject* object)
     }
 
     if (renderObject != nullptr)
-        this->m_objects.insert_or_assign (renderObject->getId (), renderObject);
+        this->m_objects.insert (std::make_pair (renderObject->getId (), renderObject));
 
     return renderObject;
 }
diff --git a/src/WallpaperEngine/Render/CTextureCache.cpp b/src/WallpaperEngine/Render/CTextureCache.cpp
index bf5d26d..f9d0622 100644
--- a/src/WallpaperEngine/Render/CTextureCache.cpp
+++ b/src/WallpaperEngine/Render/CTextureCache.cpp
@@ -24,7 +24,7 @@ const ITexture* CTextureCache::resolve (const std::string& filename)
     return texture;
 }
 
-void CTextureCache::store (const std::string& name, const ITexture* texture)
+void CTextureCache::store (std::string name, const ITexture* texture)
 {
     this->m_textureCache.insert_or_assign (name, texture);
 }
\ No newline at end of file
diff --git a/src/WallpaperEngine/Render/CTextureCache.h b/src/WallpaperEngine/Render/CTextureCache.h
index 2eb6896..13953dc 100644
--- a/src/WallpaperEngine/Render/CTextureCache.h
+++ b/src/WallpaperEngine/Render/CTextureCache.h
@@ -33,7 +33,7 @@ namespace WallpaperEngine::Render
          * @param name
          * @param texture
          */
-        void store (const std::string& name, const ITexture* texture);
+        void store (std::string name, const ITexture* texture);
 
     private:
         CRenderContext& m_context;
diff --git a/src/WallpaperEngine/Render/CWallpaper.cpp b/src/WallpaperEngine/Render/CWallpaper.cpp
index 16c4304..3bf1435 100644
--- a/src/WallpaperEngine/Render/CWallpaper.cpp
+++ b/src/WallpaperEngine/Render/CWallpaper.cpp
@@ -346,7 +346,7 @@ CFBO* CWallpaper::createFBO (const std::string& name, ITexture::TextureFormat fo
 {
     CFBO* fbo = new CFBO (name, format, flags, scale, realWidth, realHeight, textureWidth, textureHeight);
 
-    this->m_fbos.insert_or_assign (name, fbo);
+    this->m_fbos.insert (std::make_pair (name, fbo));
 
     return fbo;
 }
diff --git a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
index 6435a53..936dc5c 100644
--- a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
+++ b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp
@@ -492,14 +492,14 @@ void CPass::setupUniforms ()
         {
             if (bindCur != bindEnd)
             {
-                this->m_finalTextures.insert_or_assign ((*bindCur).first, nullptr);
+                this->m_finalTextures.insert (std::make_pair ((*bindCur).first, nullptr));
                 bindCur ++;
             }
 
             if (cur != end)
             {
                 if ((*cur) != nullptr)
-                    this->m_finalTextures.insert_or_assign (index, *cur);
+                    this->m_finalTextures.insert (std::make_pair (index, *cur));
 
                 index ++;
                 cur ++;
@@ -524,7 +524,7 @@ void CPass::setupUniforms ()
                     else
                         textureRef = this->getMaterial ()->getImage ()->getScene ()->getContext ().resolveTexture (textureName);
 
-                    this->m_finalTextures.insert_or_assign ((*fragCur).first, textureRef);
+                    this->m_finalTextures.insert (std::make_pair ((*fragCur).first, textureRef));
                 }
                 catch (std::runtime_error& ex)
                 {
@@ -553,7 +553,7 @@ void CPass::setupUniforms ()
                     else
                         textureRef = this->getMaterial ()->getImage ()->getScene ()->getContext ().resolveTexture (textureName);
 
-                    this->m_finalTextures.insert_or_assign ((*vertCur).first, textureRef);
+                    this->m_finalTextures.insert (std::make_pair ((*vertCur).first, textureRef));
                 }
                 catch (std::runtime_error& ex)
                 {
@@ -621,7 +621,9 @@ void CPass::addUniform (const std::string& name, UniformType type, T value)
     T* newValue = new T (value);
 
     // uniform found, add it to the list
-    this->m_uniforms.insert_or_assign (name, new UniformEntry (id, name, type, newValue));
+    this->m_uniforms.insert (
+        std::make_pair (name, new UniformEntry (id, name, type, newValue))
+    );
 }
 
 template <typename T>
@@ -635,7 +637,9 @@ void CPass::addUniform (const std::string& name, UniformType type, T* value)
         return;
 
     // uniform found, add it to the list
-    this->m_uniforms.insert_or_assign (name, new UniformEntry (id, name, type, value));
+    this->m_uniforms.insert (
+        std::make_pair (name, new UniformEntry (id, name, type, value))
+    );
 }
 
 template <typename T>
@@ -649,8 +653,8 @@ void CPass::addUniform (const std::string& name, UniformType type, T** value)
         return;
 
     // uniform found, add it to the list
-    this->m_referenceUniforms.insert_or_assign (
-        name, new ReferenceUniformEntry (id, name, type, reinterpret_cast <const void**> (value))
+    this->m_referenceUniforms.insert (
+        std::make_pair (name, new ReferenceUniformEntry (id, name, type, reinterpret_cast <const void**> (value)))
     );
 }
 
@@ -675,7 +679,7 @@ void CPass::setupTextures ()
 
             if (fbo != nullptr)
             {
-                this->m_fbos.insert_or_assign (index, fbo);
+                this->m_fbos.insert (std::make_pair (index, fbo));
                 this->m_textures.emplace_back (
                     fbo
                 );
diff --git a/src/WallpaperEngine/Render/Shaders/Compiler.cpp b/src/WallpaperEngine/Render/Shaders/Compiler.cpp
index 894a509..06603a2 100644
--- a/src/WallpaperEngine/Render/Shaders/Compiler.cpp
+++ b/src/WallpaperEngine/Render/Shaders/Compiler.cpp
@@ -56,7 +56,7 @@ namespace WallpaperEngine::Render::Shaders
 
         // clone the combos into the baseCombos to keep track of values that must be embedded no matter what
         for (const auto& cur : *this->m_combos)
-            this->m_baseCombos.insert_or_assign(cur.first, cur.second);
+            this->m_baseCombos.insert (std::make_pair (cur.first, cur.second));
     }
 
     bool Compiler::peekString(std::string str, std::string::const_iterator& it)
@@ -579,7 +579,7 @@ namespace WallpaperEngine::Render::Shaders
         auto entry = this->m_combos->find ((*combo).get <std::string> ());
 
         // add the combo to the found list
-        this->m_foundCombos->insert_or_assign (*combo, true);
+        this->m_foundCombos->insert (std::make_pair <std::string, int> (*combo, true));
 
         // if the combo was not found in the predefined values this means that the default value in the JSON data can be used
         // so only define the ones that are not already defined
@@ -589,7 +589,7 @@ namespace WallpaperEngine::Render::Shaders
             if (defvalue == data.end ())
             {
                 // TODO: PROPERLY SUPPORT EMPTY COMBOS
-                this->m_combos->insert_or_assign (*combo, (int) defaultValue);
+                this->m_combos->insert (std::make_pair <std::string, int> (*combo, (int) defaultValue));
             }
             else if ((*defvalue).is_number_float ())
             {
@@ -597,7 +597,7 @@ namespace WallpaperEngine::Render::Shaders
             }
             else if ((*defvalue).is_number_integer ())
             {
-                this->m_combos->insert_or_assign (*combo, (*defvalue).get <int> ());
+                this->m_combos->insert (std::make_pair <std::string, int> (*combo, (*defvalue).get <int> ()));
             }
             else if ((*defvalue).is_string ())
             {
@@ -697,16 +697,16 @@ namespace WallpaperEngine::Render::Shaders
                 if (this->m_passTextures.size () > index && (!this->m_passTextures.at (index).empty() || textureName != data.end ()))
                 {
                     // add the new combo to the list
-                    this->m_combos->insert_or_assign (*combo, 1);
+                    this->m_combos->insert (std::make_pair <std::string, int> (*combo, 1));
 
                     // textures linked to combos need to be tracked too
                     if (this->m_foundCombos->find (*combo) == this->m_foundCombos->end ())
-                        this->m_foundCombos->insert_or_assign (*combo, true);
+                        this->m_foundCombos->insert (std::make_pair <std::string, bool> (*combo, true));
                 }
             }
 
             if (textureName != data.end ())
-                this->m_textures.insert_or_assign (index, *textureName);
+                this->m_textures.insert (std::make_pair (index, *textureName));
 
             // samplers are not saved, we can ignore them for now
             return;