diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6340051..548639c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/src/GameData/Accessories.h b/src/GameData/Accessories.h
index 78ffa90..0eb4463 100644
--- a/src/GameData/Accessories.h
+++ b/src/GameData/Accessories.h
@@ -25,7 +25,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 struct Accessory {
     Containers::StringView name;
@@ -780,4 +780,4 @@ static const std::map<std::int32_t, Accessory> accessories{
     // endregion
 };
 
-}}
+}
diff --git a/src/GameData/ArmourSets.h b/src/GameData/ArmourSets.h
index 85c1762..b88a83d 100644
--- a/src/GameData/ArmourSets.h
+++ b/src/GameData/ArmourSets.h
@@ -25,7 +25,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 struct ArmourSet {
     Containers::StringView name;
@@ -58,4 +58,4 @@ static const std::map<std::int32_t, ArmourSet> armour_sets {
     {27, {"Axial Core X-Type"_s, false}},
 };
 
-}}
+}
diff --git a/src/GameData/LastMissionId.h b/src/GameData/LastMissionId.h
index 3f041c8..61c1e7f 100644
--- a/src/GameData/LastMissionId.h
+++ b/src/GameData/LastMissionId.h
@@ -23,7 +23,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 static const std::map<std::int32_t, Containers::StringView> mission_id_map {{
     // Story missions
@@ -59,4 +59,4 @@ static const std::map<std::int32_t, Containers::StringView> mission_id_map {{
     {400, "Challenge 3 - Gates of Ascension"_s}
 }};
 
-}}
+}
diff --git a/src/GameData/ResourceIDs.h b/src/GameData/ResourceIDs.h
index d070355..1affa75 100644
--- a/src/GameData/ResourceIDs.h
+++ b/src/GameData/ResourceIDs.h
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 enum MaterialID : std::int32_t {
     VerseSteel    = 0xC3500,
@@ -48,4 +48,4 @@ enum MaterialID : std::int32_t {
     IsolatedVoidParticle  = 0xDBBA5,
 };
 
-}}
+}
diff --git a/src/GameData/StoryProgress.h b/src/GameData/StoryProgress.h
index d620c53..9a891cf 100644
--- a/src/GameData/StoryProgress.h
+++ b/src/GameData/StoryProgress.h
@@ -22,7 +22,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 struct StoryProgressPoint {
     std::int32_t id{};
@@ -112,4 +112,4 @@ static const Corrade::Containers::Array<StoryProgressPoint> story_progress
     }
 };
 
-}}
+}
diff --git a/src/GameData/StyleNames.h b/src/GameData/StyleNames.h
index 3dbe5b8..a64a73a 100644
--- a/src/GameData/StyleNames.h
+++ b/src/GameData/StyleNames.h
@@ -25,7 +25,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 extern const std::map<std::int32_t, Containers::StringView> builtin_style_names
 #ifdef STYLENAMES_DEFINITION
@@ -162,4 +162,4 @@ extern const std::map<std::int32_t, Containers::StringView> builtin_style_names
 #endif
 ;
 
-}}
+}
diff --git a/src/GameData/WeaponParts.h b/src/GameData/WeaponParts.h
index e0fb8d8..0f8c8f4 100644
--- a/src/GameData/WeaponParts.h
+++ b/src/GameData/WeaponParts.h
@@ -25,7 +25,7 @@ using namespace Corrade;
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameData {
+namespace mbst::GameData {
 
 // region Melee
 static const std::map<std::int32_t, Containers::StringView> melee_grips {
@@ -433,4 +433,4 @@ static const std::map<std::int32_t, Containers::StringView> elauncher_pods {
 };
 // endregion
 
-}}
+}
diff --git a/src/GameObjects/Accessory.h b/src/GameObjects/Accessory.h
index 6779d2e..d6e6cae 100644
--- a/src/GameObjects/Accessory.h
+++ b/src/GameObjects/Accessory.h
@@ -24,7 +24,7 @@
 using namespace Corrade;
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct Accessory {
     std::int32_t attachIndex = -1;
@@ -37,4 +37,4 @@ struct Accessory {
     Vector3 localScale{1.0f};
 };
 
-}}
+}
diff --git a/src/GameObjects/ArmourPart.h b/src/GameObjects/ArmourPart.h
index 1b8076d..03d2fc5 100644
--- a/src/GameObjects/ArmourPart.h
+++ b/src/GameObjects/ArmourPart.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct ArmourPart {
     enum class Slot {
@@ -39,4 +39,4 @@ struct ArmourPart {
     Containers::Array<Accessory> accessories;
 };
 
-}}
+}
diff --git a/src/GameObjects/BulletLauncherAttachment.h b/src/GameObjects/BulletLauncherAttachment.h
index 7f9b58b..a83ffda 100644
--- a/src/GameObjects/BulletLauncherAttachment.h
+++ b/src/GameObjects/BulletLauncherAttachment.h
@@ -24,7 +24,7 @@
 using namespace Corrade;
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 enum class BulletLauncherAttachmentStyle {
     #define c(enumerator, enumstr) enumerator,
@@ -46,4 +46,4 @@ struct BulletLauncherAttachment {
     Vector3 relativeScale;
 };
 
-}}
+}
diff --git a/src/GameObjects/CustomStyle.h b/src/GameObjects/CustomStyle.h
index b7d6ec0..29e1f1d 100644
--- a/src/GameObjects/CustomStyle.h
+++ b/src/GameObjects/CustomStyle.h
@@ -25,7 +25,7 @@
 using namespace Corrade;
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct CustomStyle {
     Containers::String name;
@@ -50,4 +50,4 @@ struct CustomStyle {
     } type = Type::Unknown;
 };
 
-}}
+}
diff --git a/src/GameObjects/Decal.h b/src/GameObjects/Decal.h
index f071791..7d75670 100644
--- a/src/GameObjects/Decal.h
+++ b/src/GameObjects/Decal.h
@@ -23,7 +23,7 @@
 
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct Decal {
     std::int32_t id = -1;
@@ -38,4 +38,4 @@ struct Decal {
     bool wrap = false;
 };
 
-}}
+}
diff --git a/src/GameObjects/Joints.h b/src/GameObjects/Joints.h
index e731e91..ebb294a 100644
--- a/src/GameObjects/Joints.h
+++ b/src/GameObjects/Joints.h
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct Joints {
     float neck      = 0.0f;
@@ -29,4 +29,4 @@ struct Joints {
     float lowerLegs = 0.0f;
 };
 
-}}
+}
diff --git a/src/GameObjects/Mass.cpp b/src/GameObjects/Mass.cpp
index 9e6f35f..6025185 100644
--- a/src/GameObjects/Mass.cpp
+++ b/src/GameObjects/Mass.cpp
@@ -34,7 +34,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Mass::Mass(Containers::StringView path) {
     auto split = Utility::Path::split(path);
@@ -402,4 +402,4 @@ Mass::getTuningCategory(Containers::StringView big_node_prop_name, std::int32_t&
     }
 }
 
-}}
+}
diff --git a/src/GameObjects/Mass.h b/src/GameObjects/Mass.h
index 3c9d921..13edb42 100644
--- a/src/GameObjects/Mass.h
+++ b/src/GameObjects/Mass.h
@@ -42,7 +42,7 @@
 using namespace Corrade;
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 class Mass {
     public:
@@ -213,4 +213,4 @@ class Mass {
         Containers::String _account;
 };
 
-}}
+}
diff --git a/src/GameObjects/Mass_Armour.cpp b/src/GameObjects/Mass_Armour.cpp
index 34b6f9b..2de6d08 100644
--- a/src/GameObjects/Mass_Armour.cpp
+++ b/src/GameObjects/Mass_Armour.cpp
@@ -29,7 +29,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Containers::ArrayView<ArmourPart>
 Mass::armourParts() {
@@ -448,4 +448,4 @@ Mass::writeArmourCustomStyle(std::size_t index) {
     return writeCustomStyle(_armour.customStyles[index], index, armour_styles);
 }
 
-}}
+}
diff --git a/src/GameObjects/Mass_DecalsAccessories.cpp b/src/GameObjects/Mass_DecalsAccessories.cpp
index fe68000..6b94fc5 100644
--- a/src/GameObjects/Mass_DecalsAccessories.cpp
+++ b/src/GameObjects/Mass_DecalsAccessories.cpp
@@ -29,7 +29,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 void
 Mass::getDecals(Containers::ArrayView<Decal> decals, Gvas::Types::ArrayProperty* decal_array) {
@@ -153,4 +153,4 @@ Mass::writeAccessories(Containers::ArrayView<Accessory> accessories, Gvas::Types
     }
 }
 
-}}
+}
diff --git a/src/GameObjects/Mass_Frame.cpp b/src/GameObjects/Mass_Frame.cpp
index e19f20f..cae1676 100644
--- a/src/GameObjects/Mass_Frame.cpp
+++ b/src/GameObjects/Mass_Frame.cpp
@@ -26,7 +26,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Joints&
 Mass::jointSliders() {
@@ -408,4 +408,4 @@ Mass::writeFrameCustomStyle(std::size_t index) {
     return writeCustomStyle(_frame.customStyles[index], index, frame_styles);
 }
 
-}}
+}
diff --git a/src/GameObjects/Mass_Styles.cpp b/src/GameObjects/Mass_Styles.cpp
index daa0c8d..25311aa 100644
--- a/src/GameObjects/Mass_Styles.cpp
+++ b/src/GameObjects/Mass_Styles.cpp
@@ -27,7 +27,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Containers::ArrayView<CustomStyle>
 Mass::globalStyles() {
@@ -155,4 +155,4 @@ Mass::writeCustomStyle(const CustomStyle& style, std::size_t index, Gvas::Types:
     return true;
 }
 
-}}
+}
diff --git a/src/GameObjects/Mass_Weapons.cpp b/src/GameObjects/Mass_Weapons.cpp
index ef8f975..5b29e38 100644
--- a/src/GameObjects/Mass_Weapons.cpp
+++ b/src/GameObjects/Mass_Weapons.cpp
@@ -28,7 +28,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Containers::ArrayView<Weapon>
 Mass::meleeWeapons() {
@@ -385,4 +385,4 @@ Mass::writeWeaponType(Containers::StringView prop_name, Containers::ArrayView<We
     return true;
 }
 
-}}
+}
diff --git a/src/GameObjects/Profile.cpp b/src/GameObjects/Profile.cpp
index cc342e1..a83e6ee 100644
--- a/src/GameObjects/Profile.cpp
+++ b/src/GameObjects/Profile.cpp
@@ -31,7 +31,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Profile::Profile(Containers::StringView path):
     _profile(path)
@@ -318,4 +318,4 @@ Profile::getResource(Containers::StringView container, GameData::MaterialID id)
     return it != mats_prop->items.end() ? dynamic_cast<Gvas::Types::ResourceItemValue*>(it->get())->quantity : 0;
 }
 
-}}
+}
diff --git a/src/GameObjects/Profile.h b/src/GameObjects/Profile.h
index 426d2cc..2735b01 100644
--- a/src/GameObjects/Profile.h
+++ b/src/GameObjects/Profile.h
@@ -26,7 +26,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 class Profile {
     public:
@@ -89,4 +89,4 @@ class Profile {
         Containers::String _lastError;
 };
 
-}}
+}
diff --git a/src/GameObjects/Weapon.cpp b/src/GameObjects/Weapon.cpp
index 9f3b230..cc9d646 100644
--- a/src/GameObjects/Weapon.cpp
+++ b/src/GameObjects/Weapon.cpp
@@ -16,7 +16,7 @@
 
 #include "Weapon.h"
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 Weapon::Weapon(const Weapon& other) {
     name = other.name;
@@ -51,4 +51,4 @@ Weapon::operator=(const Weapon& other) {
     return *this;
 }
 
-}}
+}
diff --git a/src/GameObjects/Weapon.h b/src/GameObjects/Weapon.h
index 68c99dc..f72f660 100644
--- a/src/GameObjects/Weapon.h
+++ b/src/GameObjects/Weapon.h
@@ -29,7 +29,7 @@
 using namespace Corrade;
 using namespace Magnum;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct Weapon {
     Weapon() = default;
@@ -63,4 +63,4 @@ struct Weapon {
     Color4 effectColour{0.0f};
 };
 
-}}
+}
diff --git a/src/GameObjects/WeaponPart.h b/src/GameObjects/WeaponPart.h
index 595754b..d6e519c 100644
--- a/src/GameObjects/WeaponPart.h
+++ b/src/GameObjects/WeaponPart.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace GameObjects {
+namespace mbst::GameObjects {
 
 struct WeaponPart {
     WeaponPart() = default;
@@ -64,4 +64,4 @@ struct WeaponPart {
     Containers::Array<Accessory> accessories{};
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/AbstractUnrealCollectionProperty.h b/src/Gvas/Serialisers/AbstractUnrealCollectionProperty.h
index db440d6..e7d6095 100644
--- a/src/Gvas/Serialisers/AbstractUnrealCollectionProperty.h
+++ b/src/Gvas/Serialisers/AbstractUnrealCollectionProperty.h
@@ -27,7 +27,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 using PropertyArray = Containers::Array<Types::UnrealPropertyBase::ptr>;
 using PropertyArrayView = Containers::ArrayView<Types::UnrealPropertyBase::ptr>;
@@ -50,4 +50,4 @@ class AbstractUnrealCollectionProperty {
                                PropertySerialiser& serialiser) = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/AbstractUnrealProperty.h b/src/Gvas/Serialisers/AbstractUnrealProperty.h
index 061e95c..a8030c4 100644
--- a/src/Gvas/Serialisers/AbstractUnrealProperty.h
+++ b/src/Gvas/Serialisers/AbstractUnrealProperty.h
@@ -26,7 +26,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 using StringArrayView = Containers::ArrayView<const Containers::String>;
 
@@ -46,4 +46,4 @@ class AbstractUnrealProperty {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/AbstractUnrealStruct.h b/src/Gvas/Serialisers/AbstractUnrealStruct.h
index 715c2e7..b9d1e08 100644
--- a/src/Gvas/Serialisers/AbstractUnrealStruct.h
+++ b/src/Gvas/Serialisers/AbstractUnrealStruct.h
@@ -27,7 +27,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class AbstractUnrealStruct {
     public:
@@ -43,4 +43,4 @@ class AbstractUnrealStruct {
                                std::size_t& bytes_written) = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ArrayProperty.cpp b/src/Gvas/Serialisers/ArrayProperty.cpp
index 0b8a13f..d6c4254 100644
--- a/src/Gvas/Serialisers/ArrayProperty.cpp
+++ b/src/Gvas/Serialisers/ArrayProperty.cpp
@@ -23,7 +23,7 @@
 
 #include "ArrayProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 ArrayProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -76,4 +76,4 @@ ArrayProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size
     return ret;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ArrayProperty.h b/src/Gvas/Serialisers/ArrayProperty.h
index 2ed6f56..9a0080a 100644
--- a/src/Gvas/Serialisers/ArrayProperty.h
+++ b/src/Gvas/Serialisers/ArrayProperty.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class ArrayProperty : public UnrealProperty<Types::ArrayProperty> {
     public:
@@ -38,4 +38,4 @@ class ArrayProperty : public UnrealProperty<Types::ArrayProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/BoolProperty.cpp b/src/Gvas/Serialisers/BoolProperty.cpp
index 3f38495..80de98a 100644
--- a/src/Gvas/Serialisers/BoolProperty.cpp
+++ b/src/Gvas/Serialisers/BoolProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "BoolProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 BoolProperty::types() {
@@ -70,4 +70,4 @@ BoolProperty::serialise(Types::UnrealPropertyBase::ptr& prop, std::size_t& bytes
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/BoolProperty.h b/src/Gvas/Serialisers/BoolProperty.h
index b36a66d..a80b2e2 100644
--- a/src/Gvas/Serialisers/BoolProperty.h
+++ b/src/Gvas/Serialisers/BoolProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class BoolProperty : public AbstractUnrealProperty {
     public:
@@ -41,4 +41,4 @@ class BoolProperty : public AbstractUnrealProperty {
                        PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ByteProperty.cpp b/src/Gvas/Serialisers/ByteProperty.cpp
index ca0a104..fba23ea 100644
--- a/src/Gvas/Serialisers/ByteProperty.cpp
+++ b/src/Gvas/Serialisers/ByteProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "ByteProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 ByteProperty::types() {
@@ -31,7 +31,7 @@ ByteProperty::types() {
 
 Types::UnrealPropertyBase::ptr
 ByteProperty::deserialise(Containers::StringView name, Containers::StringView type, std::size_t value_length,
-                                    BinaryIo::Reader& reader, PropertySerialiser& serialiser)
+                          BinaryIo::Reader& reader, PropertySerialiser& serialiser)
 {
     auto prop = Containers::pointer<Types::ByteProperty>();
 
@@ -91,4 +91,4 @@ ByteProperty::serialise(Types::UnrealPropertyBase::ptr& prop, std::size_t& bytes
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ByteProperty.h b/src/Gvas/Serialisers/ByteProperty.h
index f5e97c4..4a80cba 100644
--- a/src/Gvas/Serialisers/ByteProperty.h
+++ b/src/Gvas/Serialisers/ByteProperty.h
@@ -23,7 +23,7 @@
 
 #include "../Types/ByteProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class ByteProperty : public AbstractUnrealProperty {
     public:
@@ -39,4 +39,4 @@ class ByteProperty : public AbstractUnrealProperty {
                        PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ColourProperty.cpp b/src/Gvas/Serialisers/ColourProperty.cpp
index fd39617..d2923af 100644
--- a/src/Gvas/Serialisers/ColourProperty.cpp
+++ b/src/Gvas/Serialisers/ColourProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "ColourProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 ColourProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -56,4 +56,4 @@ ColourProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::siz
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ColourProperty.h b/src/Gvas/Serialisers/ColourProperty.h
index b86061c..69ac66d 100644
--- a/src/Gvas/Serialisers/ColourProperty.h
+++ b/src/Gvas/Serialisers/ColourProperty.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class ColourProperty : public UnrealProperty<Types::ColourStructProperty> {
     public:
@@ -38,4 +38,4 @@ class ColourProperty : public UnrealProperty<Types::ColourStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/DateTimeProperty.cpp b/src/Gvas/Serialisers/DateTimeProperty.cpp
index 1a4caf3..b4b5d9c 100644
--- a/src/Gvas/Serialisers/DateTimeProperty.cpp
+++ b/src/Gvas/Serialisers/DateTimeProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "DateTimeProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 DateTimeProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type,
@@ -51,4 +51,4 @@ DateTimeProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::s
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/DateTimeProperty.h b/src/Gvas/Serialisers/DateTimeProperty.h
index 6d7822e..8b7dfa0 100644
--- a/src/Gvas/Serialisers/DateTimeProperty.h
+++ b/src/Gvas/Serialisers/DateTimeProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/DateTimeStructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class DateTimeProperty : public UnrealProperty<Types::DateTimeStructProperty> {
     public:
@@ -36,4 +36,4 @@ class DateTimeProperty : public UnrealProperty<Types::DateTimeStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/EnumProperty.cpp b/src/Gvas/Serialisers/EnumProperty.cpp
index c475cf4..04feb7d 100644
--- a/src/Gvas/Serialisers/EnumProperty.cpp
+++ b/src/Gvas/Serialisers/EnumProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "EnumProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 EnumProperty::types() {
@@ -71,4 +71,4 @@ EnumProperty::serialise(Types::UnrealPropertyBase::ptr& prop, std::size_t& bytes
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/EnumProperty.h b/src/Gvas/Serialisers/EnumProperty.h
index 3ed25f9..97929f3 100644
--- a/src/Gvas/Serialisers/EnumProperty.h
+++ b/src/Gvas/Serialisers/EnumProperty.h
@@ -23,7 +23,7 @@
 
 #include "../Types/EnumProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class EnumProperty : public AbstractUnrealProperty {
     public:
@@ -39,4 +39,4 @@ class EnumProperty : public AbstractUnrealProperty {
                        PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/FloatProperty.cpp b/src/Gvas/Serialisers/FloatProperty.cpp
index 84ee2b1..11be552 100644
--- a/src/Gvas/Serialisers/FloatProperty.cpp
+++ b/src/Gvas/Serialisers/FloatProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "FloatProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 FloatProperty::types() {
@@ -65,4 +65,4 @@ FloatProperty::serialise(Types::UnrealPropertyBase::ptr& prop, std::size_t& byte
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/FloatProperty.h b/src/Gvas/Serialisers/FloatProperty.h
index 2a94b10..5547a7b 100644
--- a/src/Gvas/Serialisers/FloatProperty.h
+++ b/src/Gvas/Serialisers/FloatProperty.h
@@ -23,7 +23,7 @@
 
 #include "../Types/FloatProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class FloatProperty : public AbstractUnrealProperty {
     public:
@@ -39,4 +39,4 @@ class FloatProperty : public AbstractUnrealProperty {
                        PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/GuidProperty.cpp b/src/Gvas/Serialisers/GuidProperty.cpp
index 8d1f04b..5626346 100644
--- a/src/Gvas/Serialisers/GuidProperty.cpp
+++ b/src/Gvas/Serialisers/GuidProperty.cpp
@@ -22,7 +22,7 @@
 
 using namespace Containers::Literals;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 GuidProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -53,4 +53,4 @@ GuidProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size_
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/GuidProperty.h b/src/Gvas/Serialisers/GuidProperty.h
index a704a9f..5942be5 100644
--- a/src/Gvas/Serialisers/GuidProperty.h
+++ b/src/Gvas/Serialisers/GuidProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/GuidStructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class GuidProperty : public UnrealProperty<Types::GuidStructProperty> {
     public:
@@ -36,4 +36,4 @@ class GuidProperty : public UnrealProperty<Types::GuidStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/IntProperty.cpp b/src/Gvas/Serialisers/IntProperty.cpp
index f4b24ea..c08b1ec 100644
--- a/src/Gvas/Serialisers/IntProperty.cpp
+++ b/src/Gvas/Serialisers/IntProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "IntProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 IntProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -73,4 +73,4 @@ IntProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size_t
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/IntProperty.h b/src/Gvas/Serialisers/IntProperty.h
index 7b9002b..59e0ca6 100644
--- a/src/Gvas/Serialisers/IntProperty.h
+++ b/src/Gvas/Serialisers/IntProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/IntProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class IntProperty : public UnrealProperty<Types::IntProperty> {
     public:
@@ -36,4 +36,4 @@ class IntProperty : public UnrealProperty<Types::IntProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/MapProperty.cpp b/src/Gvas/Serialisers/MapProperty.cpp
index 2925276..041f0f9 100644
--- a/src/Gvas/Serialisers/MapProperty.cpp
+++ b/src/Gvas/Serialisers/MapProperty.cpp
@@ -24,7 +24,7 @@
 
 using namespace Containers::Literals;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 MapProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -156,4 +156,4 @@ MapProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size_t
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/MapProperty.h b/src/Gvas/Serialisers/MapProperty.h
index efd6553..044e06e 100644
--- a/src/Gvas/Serialisers/MapProperty.h
+++ b/src/Gvas/Serialisers/MapProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/MapProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class MapProperty : public UnrealProperty<Types::MapProperty> {
     public:
@@ -36,4 +36,4 @@ class MapProperty : public UnrealProperty<Types::MapProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ResourceProperty.cpp b/src/Gvas/Serialisers/ResourceProperty.cpp
index 58f9403..4fd36e4 100644
--- a/src/Gvas/Serialisers/ResourceProperty.cpp
+++ b/src/Gvas/Serialisers/ResourceProperty.cpp
@@ -25,7 +25,7 @@
 
 using namespace Containers::Literals;
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 ResourceProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type,
@@ -107,4 +107,4 @@ ResourceProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::s
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/ResourceProperty.h b/src/Gvas/Serialisers/ResourceProperty.h
index 351a5bd..d9ef0b3 100644
--- a/src/Gvas/Serialisers/ResourceProperty.h
+++ b/src/Gvas/Serialisers/ResourceProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/ResourceItemValue.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class ResourceProperty : public UnrealProperty<Types::ResourceItemValue> {
     public:
@@ -36,4 +36,4 @@ class ResourceProperty : public UnrealProperty<Types::ResourceItemValue> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/RotatorProperty.cpp b/src/Gvas/Serialisers/RotatorProperty.cpp
index c3759a2..bb495d9 100644
--- a/src/Gvas/Serialisers/RotatorProperty.cpp
+++ b/src/Gvas/Serialisers/RotatorProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "RotatorProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 RotatorProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -53,4 +53,4 @@ RotatorProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::si
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/RotatorProperty.h b/src/Gvas/Serialisers/RotatorProperty.h
index 63fdb4e..355f1b3 100644
--- a/src/Gvas/Serialisers/RotatorProperty.h
+++ b/src/Gvas/Serialisers/RotatorProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/RotatorStructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class RotatorProperty : public UnrealProperty<Types::RotatorStructProperty> {
     public:
@@ -36,4 +36,4 @@ class RotatorProperty : public UnrealProperty<Types::RotatorStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/Serialisers.h b/src/Gvas/Serialisers/Serialisers.h
index 8c8470c..d1bf748 100644
--- a/src/Gvas/Serialisers/Serialisers.h
+++ b/src/Gvas/Serialisers/Serialisers.h
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class AbstractUnrealCollectionProperty;
 class AbstractUnrealProperty;
@@ -41,4 +41,4 @@ class UnrealProperty;
 class Vector2DProperty;
 class VectorProperty;
 
-}}
+}
diff --git a/src/Gvas/Serialisers/SetProperty.cpp b/src/Gvas/Serialisers/SetProperty.cpp
index dd7220f..e010996 100644
--- a/src/Gvas/Serialisers/SetProperty.cpp
+++ b/src/Gvas/Serialisers/SetProperty.cpp
@@ -21,7 +21,7 @@
 
 #include "SetProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 SetProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -82,4 +82,4 @@ SetProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size_t
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/SetProperty.h b/src/Gvas/Serialisers/SetProperty.h
index 5291d9f..7fa5276 100644
--- a/src/Gvas/Serialisers/SetProperty.h
+++ b/src/Gvas/Serialisers/SetProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/SetProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class SetProperty : public UnrealProperty<Types::SetProperty> {
     public:
@@ -36,4 +36,4 @@ class SetProperty : public UnrealProperty<Types::SetProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/StringProperty.cpp b/src/Gvas/Serialisers/StringProperty.cpp
index 0dbe810..c9e36f0 100644
--- a/src/Gvas/Serialisers/StringProperty.cpp
+++ b/src/Gvas/Serialisers/StringProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "StringProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 StringProperty::types() {
@@ -74,4 +74,4 @@ StringProperty::serialise(Types::UnrealPropertyBase::ptr& prop, std::size_t& byt
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/StringProperty.h b/src/Gvas/Serialisers/StringProperty.h
index ceba34b..75d868e 100644
--- a/src/Gvas/Serialisers/StringProperty.h
+++ b/src/Gvas/Serialisers/StringProperty.h
@@ -23,7 +23,7 @@
 
 #include "../Types/StringProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class StringProperty : public AbstractUnrealProperty {
     public:
@@ -39,4 +39,4 @@ class StringProperty : public AbstractUnrealProperty {
                        PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/Struct.cpp b/src/Gvas/Serialisers/Struct.cpp
index c16cccd..ee73e54 100644
--- a/src/Gvas/Serialisers/Struct.cpp
+++ b/src/Gvas/Serialisers/Struct.cpp
@@ -25,7 +25,7 @@
 
 #include "Struct.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 StringArrayView
 Struct::types() {
@@ -242,4 +242,4 @@ Struct::writeStructValue(Types::StructProperty* prop, std::size_t& bytes_written
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/Struct.h b/src/Gvas/Serialisers/Struct.h
index 18bd2b3..339dd4e 100644
--- a/src/Gvas/Serialisers/Struct.h
+++ b/src/Gvas/Serialisers/Struct.h
@@ -25,7 +25,7 @@
 
 #include "../Types/StructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class Struct : public AbstractUnrealProperty, public AbstractUnrealCollectionProperty {
     public:
@@ -52,4 +52,4 @@ class Struct : public AbstractUnrealProperty, public AbstractUnrealCollectionPro
                               PropertySerialiser& serialiser);
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/TextProperty.cpp b/src/Gvas/Serialisers/TextProperty.cpp
index 0d60c11..cd7724a 100644
--- a/src/Gvas/Serialisers/TextProperty.cpp
+++ b/src/Gvas/Serialisers/TextProperty.cpp
@@ -23,7 +23,7 @@
 
 #include "TextProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 TextProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -91,4 +91,4 @@ TextProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::size_
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/TextProperty.h b/src/Gvas/Serialisers/TextProperty.h
index 804743f..2b6d2fe 100644
--- a/src/Gvas/Serialisers/TextProperty.h
+++ b/src/Gvas/Serialisers/TextProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/TextProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class TextProperty : public UnrealProperty<Types::TextProperty> {
     public:
@@ -36,4 +36,4 @@ class TextProperty : public UnrealProperty<Types::TextProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/UnrealProperty.h b/src/Gvas/Serialisers/UnrealProperty.h
index 208a00f..3b96f15 100644
--- a/src/Gvas/Serialisers/UnrealProperty.h
+++ b/src/Gvas/Serialisers/UnrealProperty.h
@@ -25,7 +25,7 @@
 #include "AbstractUnrealProperty.h"
 #include "../Types/StructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 template<typename T>
 class UnrealProperty : public AbstractUnrealProperty {
@@ -73,4 +73,4 @@ class UnrealProperty : public AbstractUnrealProperty {
                                        BinaryIo::Writer& writer, PropertySerialiser& serialiser) = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/Vector2DProperty.cpp b/src/Gvas/Serialisers/Vector2DProperty.cpp
index e1eea29..97d228f 100644
--- a/src/Gvas/Serialisers/Vector2DProperty.cpp
+++ b/src/Gvas/Serialisers/Vector2DProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "Vector2DProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 Vector2DProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type,
@@ -53,4 +53,4 @@ Vector2DProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::s
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/Vector2DProperty.h b/src/Gvas/Serialisers/Vector2DProperty.h
index eb1935a..def656b 100644
--- a/src/Gvas/Serialisers/Vector2DProperty.h
+++ b/src/Gvas/Serialisers/Vector2DProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/Vector2DStructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class Vector2DProperty : public UnrealProperty<Types::Vector2DStructProperty> {
     public:
@@ -36,4 +36,4 @@ class Vector2DProperty : public UnrealProperty<Types::Vector2DStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Serialisers/VectorProperty.cpp b/src/Gvas/Serialisers/VectorProperty.cpp
index 964097c..3243a1f 100644
--- a/src/Gvas/Serialisers/VectorProperty.cpp
+++ b/src/Gvas/Serialisers/VectorProperty.cpp
@@ -21,7 +21,7 @@
 
 #include "VectorProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 Types::UnrealPropertyBase::ptr
 VectorProperty::deserialiseProperty(Containers::StringView name, Containers::StringView type, std::size_t value_length,
@@ -54,4 +54,4 @@ VectorProperty::serialiseProperty(Types::UnrealPropertyBase::ptr& prop, std::siz
     return true;
 }
 
-}}
+}
diff --git a/src/Gvas/Serialisers/VectorProperty.h b/src/Gvas/Serialisers/VectorProperty.h
index 94ce181..72cea55 100644
--- a/src/Gvas/Serialisers/VectorProperty.h
+++ b/src/Gvas/Serialisers/VectorProperty.h
@@ -22,7 +22,7 @@
 
 #include "../Types/VectorStructProperty.h"
 
-namespace Gvas { namespace Serialisers {
+namespace Gvas::Serialisers {
 
 class VectorProperty : public UnrealProperty<Types::VectorStructProperty> {
     public:
@@ -36,4 +36,4 @@ class VectorProperty : public UnrealProperty<Types::VectorStructProperty> {
                                BinaryIo::Writer& writer, PropertySerialiser& serialiser) override;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/ArrayProperty.h b/src/Gvas/Types/ArrayProperty.h
index 2453443..d5a9f1d 100644
--- a/src/Gvas/Types/ArrayProperty.h
+++ b/src/Gvas/Types/ArrayProperty.h
@@ -23,7 +23,7 @@
 
 #include "UnrealPropertyBase.h"
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct ArrayProperty : public UnrealPropertyBase {
     using ptr = Containers::Pointer<ArrayProperty>;
@@ -47,4 +47,4 @@ struct ArrayProperty : public UnrealPropertyBase {
     Containers::Array<UnrealPropertyBase::ptr> items;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/BoolProperty.h b/src/Gvas/Types/BoolProperty.h
index b32c888..9c19ea7 100644
--- a/src/Gvas/Types/BoolProperty.h
+++ b/src/Gvas/Types/BoolProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct BoolProperty : public UnrealProperty<bool> {
     using ptr = Containers::Pointer<BoolProperty>;
@@ -34,4 +34,4 @@ struct BoolProperty : public UnrealProperty<bool> {
     }
 };
 
-}}
+}
diff --git a/src/Gvas/Types/ByteProperty.h b/src/Gvas/Types/ByteProperty.h
index ec95ac4..4257261 100644
--- a/src/Gvas/Types/ByteProperty.h
+++ b/src/Gvas/Types/ByteProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct ByteProperty : public UnrealProperty<Containers::Array<char>> {
     using ptr = Containers::Pointer<ByteProperty>;
@@ -41,4 +41,4 @@ struct ByteProperty : public UnrealProperty<Containers::Array<char>> {
     Containers::String enumValue;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/ColourStructProperty.h b/src/Gvas/Types/ColourStructProperty.h
index f614db4..92a174c 100644
--- a/src/Gvas/Types/ColourStructProperty.h
+++ b/src/Gvas/Types/ColourStructProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct ColourStructProperty : public StructProperty {
     using ptr = Containers::Pointer<ColourStructProperty>;
@@ -34,4 +34,4 @@ struct ColourStructProperty : public StructProperty {
     float r = 0.0f, g = 0.0f, b = 0.0f, a = 0.0f;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/DateTimeStructProperty.h b/src/Gvas/Types/DateTimeStructProperty.h
index b20604d..0f05a4b 100644
--- a/src/Gvas/Types/DateTimeStructProperty.h
+++ b/src/Gvas/Types/DateTimeStructProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct DateTimeStructProperty : public StructProperty {
     using ptr = Containers::Pointer<DateTimeStructProperty>;
@@ -36,4 +36,4 @@ struct DateTimeStructProperty : public StructProperty {
     std::int64_t timestamp = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/EnumProperty.h b/src/Gvas/Types/EnumProperty.h
index e042578..50a9ac3 100644
--- a/src/Gvas/Types/EnumProperty.h
+++ b/src/Gvas/Types/EnumProperty.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct EnumProperty : public UnrealProperty<Containers::String> {
     using ptr = Containers::Pointer<EnumProperty>;
@@ -37,4 +37,4 @@ struct EnumProperty : public UnrealProperty<Containers::String> {
     Containers::String enumType;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/FloatProperty.h b/src/Gvas/Types/FloatProperty.h
index 433d7d8..6a99b6d 100644
--- a/src/Gvas/Types/FloatProperty.h
+++ b/src/Gvas/Types/FloatProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct FloatProperty : public UnrealProperty<float> {
     using ptr = Containers::Pointer<FloatProperty>;
@@ -34,4 +34,4 @@ struct FloatProperty : public UnrealProperty<float> {
     }
 };
 
-}}
+}
diff --git a/src/Gvas/Types/GenericStructProperty.h b/src/Gvas/Types/GenericStructProperty.h
index 67028e9..c46e8c4 100644
--- a/src/Gvas/Types/GenericStructProperty.h
+++ b/src/Gvas/Types/GenericStructProperty.h
@@ -26,7 +26,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct GenericStructProperty : public StructProperty {
     using ptr = Containers::Pointer<GenericStructProperty>;
@@ -56,4 +56,4 @@ struct GenericStructProperty : public StructProperty {
     Containers::Array<UnrealPropertyBase::ptr> properties;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/GuidStructProperty.h b/src/Gvas/Types/GuidStructProperty.h
index e822273..85f83f6 100644
--- a/src/Gvas/Types/GuidStructProperty.h
+++ b/src/Gvas/Types/GuidStructProperty.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct GuidStructProperty : public StructProperty {
     using ptr = Containers::Pointer<GuidStructProperty>;
@@ -37,4 +37,4 @@ struct GuidStructProperty : public StructProperty {
     Containers::StaticArray<16, char> guid{ValueInit};
 };
 
-}}
+}
diff --git a/src/Gvas/Types/IntProperty.h b/src/Gvas/Types/IntProperty.h
index 6ca3de3..947fc02 100644
--- a/src/Gvas/Types/IntProperty.h
+++ b/src/Gvas/Types/IntProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct IntProperty : public UnrealProperty<std::int32_t> {
     using ptr = Containers::Pointer<IntProperty>;
@@ -34,4 +34,4 @@ struct IntProperty : public UnrealProperty<std::int32_t> {
     }
 };
 
-}}
+}
diff --git a/src/Gvas/Types/MapProperty.h b/src/Gvas/Types/MapProperty.h
index 0d8575a..3ba902c 100644
--- a/src/Gvas/Types/MapProperty.h
+++ b/src/Gvas/Types/MapProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct MapProperty : public UnrealPropertyBase {
     using ptr = Containers::Pointer<MapProperty>;
@@ -46,4 +46,4 @@ struct MapProperty : public UnrealPropertyBase {
     Containers::Array<KeyValuePair> map;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/NoneProperty.h b/src/Gvas/Types/NoneProperty.h
index e8e339c..26727c1 100644
--- a/src/Gvas/Types/NoneProperty.h
+++ b/src/Gvas/Types/NoneProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct NoneProperty : UnrealPropertyBase {
     using ptr = Containers::Pointer<NoneProperty>;
@@ -35,4 +35,4 @@ struct NoneProperty : UnrealPropertyBase {
     }
 };
 
-}}
+}
diff --git a/src/Gvas/Types/ResourceItemValue.h b/src/Gvas/Types/ResourceItemValue.h
index 5ae9683..f196e14 100644
--- a/src/Gvas/Types/ResourceItemValue.h
+++ b/src/Gvas/Types/ResourceItemValue.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct ResourceItemValue : public StructProperty {
     using ptr = Containers::Pointer<ResourceItemValue>;
@@ -41,4 +41,4 @@ struct ResourceItemValue : public StructProperty {
     std::int32_t quantity = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/RotatorStructProperty.h b/src/Gvas/Types/RotatorStructProperty.h
index ad2d676..26d353f 100644
--- a/src/Gvas/Types/RotatorStructProperty.h
+++ b/src/Gvas/Types/RotatorStructProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct RotatorStructProperty : public StructProperty {
     using ptr = Containers::Pointer<RotatorStructProperty>;
@@ -36,4 +36,4 @@ struct RotatorStructProperty : public StructProperty {
     float x = 0.0f, y = 0.0f, z = 0.0f;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/SetProperty.h b/src/Gvas/Types/SetProperty.h
index dac31d1..63599dc 100644
--- a/src/Gvas/Types/SetProperty.h
+++ b/src/Gvas/Types/SetProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct SetProperty : public UnrealPropertyBase {
     using ptr = Containers::Pointer<SetProperty>;
@@ -47,4 +47,4 @@ struct SetProperty : public UnrealPropertyBase {
     Containers::Array<UnrealPropertyBase::ptr> items;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/StringProperty.h b/src/Gvas/Types/StringProperty.h
index d29f7cb..79b452b 100644
--- a/src/Gvas/Types/StringProperty.h
+++ b/src/Gvas/Types/StringProperty.h
@@ -25,7 +25,7 @@
 using namespace Corrade;
 using namespace Containers::Literals;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct StringProperty : public UnrealProperty<Containers::String> {
     using ptr = Containers::Pointer<StringProperty>;
@@ -35,4 +35,4 @@ struct StringProperty : public UnrealProperty<Containers::String> {
     }
 };
 
-}}
+}
diff --git a/src/Gvas/Types/StructProperty.h b/src/Gvas/Types/StructProperty.h
index bcb48a8..0ddbb3e 100644
--- a/src/Gvas/Types/StructProperty.h
+++ b/src/Gvas/Types/StructProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct StructProperty : public UnrealPropertyBase {
     using ptr = Containers::Pointer<StructProperty>;
@@ -39,4 +39,4 @@ struct StructProperty : public UnrealPropertyBase {
     Containers::String structType;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/TextProperty.h b/src/Gvas/Types/TextProperty.h
index 15a4432..75420e3 100644
--- a/src/Gvas/Types/TextProperty.h
+++ b/src/Gvas/Types/TextProperty.h
@@ -25,7 +25,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct TextProperty : public UnrealProperty<Containers::String> {
     using ptr = Containers::Pointer<TextProperty>;
@@ -40,4 +40,4 @@ struct TextProperty : public UnrealProperty<Containers::String> {
     Containers::Array<Containers::String> data;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/Types.h b/src/Gvas/Types/Types.h
index 584f8c6..628e565 100644
--- a/src/Gvas/Types/Types.h
+++ b/src/Gvas/Types/Types.h
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct UnrealPropertyBase;
 template<typename T>
@@ -42,4 +42,4 @@ struct TextProperty;
 struct Vector2DStructProperty;
 struct VectorStructProperty;
 
-}}
+}
diff --git a/src/Gvas/Types/UnrealProperty.h b/src/Gvas/Types/UnrealProperty.h
index ce1fd3e..f812cf5 100644
--- a/src/Gvas/Types/UnrealProperty.h
+++ b/src/Gvas/Types/UnrealProperty.h
@@ -22,7 +22,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 template<typename T>
 struct UnrealProperty : public UnrealPropertyBase {
@@ -31,4 +31,4 @@ struct UnrealProperty : public UnrealPropertyBase {
     T value;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/UnrealPropertyBase.h b/src/Gvas/Types/UnrealPropertyBase.h
index 2cf2883..31fb8f6 100644
--- a/src/Gvas/Types/UnrealPropertyBase.h
+++ b/src/Gvas/Types/UnrealPropertyBase.h
@@ -24,7 +24,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct UnrealPropertyBase {
     using ptr = Containers::Pointer<UnrealPropertyBase>;
@@ -36,4 +36,4 @@ struct UnrealPropertyBase {
     std::size_t valueLength = 0;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/Vector2DStructProperty.h b/src/Gvas/Types/Vector2DStructProperty.h
index 3ad8338..f6a7e1f 100644
--- a/src/Gvas/Types/Vector2DStructProperty.h
+++ b/src/Gvas/Types/Vector2DStructProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct Vector2DStructProperty : public StructProperty {
     using ptr = Containers::Pointer<Vector2DStructProperty>;
@@ -36,4 +36,4 @@ struct Vector2DStructProperty : public StructProperty {
     float x = 0.0f, y = 0.0f;
 };
 
-}}
+}
diff --git a/src/Gvas/Types/VectorStructProperty.h b/src/Gvas/Types/VectorStructProperty.h
index 1960d17..c65c117 100644
--- a/src/Gvas/Types/VectorStructProperty.h
+++ b/src/Gvas/Types/VectorStructProperty.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace Gvas { namespace Types {
+namespace Gvas::Types {
 
 struct VectorStructProperty : public StructProperty {
     using ptr = Containers::Pointer<VectorStructProperty>;
@@ -36,4 +36,4 @@ struct VectorStructProperty : public StructProperty {
     float x = 0.0f, y = 0.0f, z = 0.0f;
 };
 
-}}
+}
diff --git a/src/ImportExport/Export.cpp b/src/ImportExport/Export.cpp
index 44d4309..30ca77a 100644
--- a/src/ImportExport/Export.cpp
+++ b/src/ImportExport/Export.cpp
@@ -26,7 +26,7 @@
 
 #include "Export.h"
 
-namespace mbst { namespace ImportExport {
+namespace mbst::ImportExport {
 
 static Containers::String last_export_error;
 
@@ -124,4 +124,4 @@ exportStyle(Containers::StringView mass_name, mbst::GameObjects::CustomStyle& st
     return true;
 }
 
-}}
+}
diff --git a/src/ImportExport/Export.h b/src/ImportExport/Export.h
index e869a9f..40eda62 100644
--- a/src/ImportExport/Export.h
+++ b/src/ImportExport/Export.h
@@ -22,10 +22,10 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace ImportExport {
+namespace mbst::ImportExport {
 
 auto lastExportError() -> Containers::StringView;
 
 bool exportStyle(Containers::StringView mass_name, GameObjects::CustomStyle& style);
 
-}}
+}
diff --git a/src/ImportExport/Import.cpp b/src/ImportExport/Import.cpp
index d07a863..decdf35 100644
--- a/src/ImportExport/Import.cpp
+++ b/src/ImportExport/Import.cpp
@@ -30,7 +30,7 @@
 
 #include "Import.h"
 
-namespace mbst { namespace ImportExport {
+namespace mbst::ImportExport {
 
 static Containers::String last_import_error;
 
@@ -183,4 +183,4 @@ importStyle(Containers::StringView filename) {
     return Utility::move(style);
 }
 
-}}
+}
diff --git a/src/ImportExport/Import.h b/src/ImportExport/Import.h
index d16990a..61d0b77 100644
--- a/src/ImportExport/Import.h
+++ b/src/ImportExport/Import.h
@@ -22,10 +22,10 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace ImportExport {
+namespace mbst::ImportExport {
 
 auto lastImportError() -> Containers::StringView;
 
 auto importStyle(Containers::StringView filename) -> Containers::Optional<GameObjects::CustomStyle>;
 
-}}
+}
diff --git a/src/ImportExport/Keys.h b/src/ImportExport/Keys.h
index 0ea1228..eefc2a4 100644
--- a/src/ImportExport/Keys.h
+++ b/src/ImportExport/Keys.h
@@ -18,19 +18,19 @@
 
 #include <cstdint>
 
-namespace mbst { namespace ImportExport { namespace Keys {
+namespace mbst::ImportExport::Keys {
 
 enum CustomStyle: std::uint8_t {
-    Name = 0, // type: string
-    Colour = 1, // type: Magnum::Color4
-    Metallic = 2, // type: float
-    Gloss = 3, // type: float
-    Glow = 4, // type: bool
-    PatternId = 5, // type: std::int32_t
-    PatternOpacity = 6, // type: float
-    PatternOffset = 7, // type: Magnum::Vector2
+    Name            = 0, // type: string
+    Colour          = 1, // type: Magnum::Color4
+    Metallic        = 2, // type: float
+    Gloss           = 3, // type: float
+    Glow            = 4, // type: bool
+    PatternId       = 5, // type: std::int32_t
+    PatternOpacity  = 6, // type: float
+    PatternOffset   = 7, // type: Magnum::Vector2
     PatternRotation = 8, // type: float
-    PatternScale = 9, // type: float
+    PatternScale    = 9, // type: float
 };
 
-}}}
+}
diff --git a/src/Managers/Backup.h b/src/Managers/Backup.h
index db8b014..c644610 100644
--- a/src/Managers/Backup.h
+++ b/src/Managers/Backup.h
@@ -23,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 struct Backup {
     Containers::String filename;
@@ -40,4 +40,4 @@ struct Backup {
     Containers::Array<Containers::String> includedFiles;
 };
 
-}}
+}
diff --git a/src/Managers/BackupManager.cpp b/src/Managers/BackupManager.cpp
index 6d7a5b2..be5941a 100644
--- a/src/Managers/BackupManager.cpp
+++ b/src/Managers/BackupManager.cpp
@@ -33,7 +33,7 @@
 
 #include "BackupManager.h"
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 BackupManager::BackupManager():
     _root{""}
@@ -335,4 +335,4 @@ BackupManager::scanSubdir(Containers::StringView subdir) {
     depth--;
 }
 
-}}
+}
diff --git a/src/Managers/BackupManager.h b/src/Managers/BackupManager.h
index cc7678f..2f48e89 100644
--- a/src/Managers/BackupManager.h
+++ b/src/Managers/BackupManager.h
@@ -29,7 +29,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 class BackupManager {
     public:
@@ -60,4 +60,4 @@ class BackupManager {
         Vfs::Directory<Backup> _root;
 };
 
-}}
+}
diff --git a/src/Managers/MassManager.cpp b/src/Managers/MassManager.cpp
index eeb6f8d..19736cc 100644
--- a/src/Managers/MassManager.cpp
+++ b/src/Managers/MassManager.cpp
@@ -26,7 +26,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 MassManager::MassManager(Containers::StringView account, bool demo):
     _account{account}, _demo{demo}
@@ -268,4 +268,4 @@ MassManager::deleteStagedMass(Containers::StringView filename) {
     return true;
 }
 
-}}
+}
diff --git a/src/Managers/MassManager.h b/src/Managers/MassManager.h
index d4e8b71..8135012 100644
--- a/src/Managers/MassManager.h
+++ b/src/Managers/MassManager.h
@@ -26,7 +26,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 class MassManager {
     public:
@@ -60,4 +60,4 @@ class MassManager {
         std::map<Containers::String, Containers::String> _stagedMasses;
 };
 
-}}
+}
diff --git a/src/Managers/ProfileManager.cpp b/src/Managers/ProfileManager.cpp
index 85c1784..6dc724e 100644
--- a/src/Managers/ProfileManager.cpp
+++ b/src/Managers/ProfileManager.cpp
@@ -29,7 +29,7 @@
 
 using namespace Containers::Literals;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 ProfileManager::ProfileManager() {
     _ready = refreshProfiles();
@@ -129,4 +129,4 @@ ProfileManager::deleteProfile(std::size_t index, bool delete_builds) {
     return true;
 }
 
-}}
+}
diff --git a/src/Managers/ProfileManager.h b/src/Managers/ProfileManager.h
index 6116518..8418ddf 100644
--- a/src/Managers/ProfileManager.h
+++ b/src/Managers/ProfileManager.h
@@ -16,10 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include <cstdint>
-
-#include <string>
-
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/String.h>
 
@@ -27,7 +23,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Managers {
+namespace mbst::Managers {
 
 class ProfileManager {
     public:
@@ -49,4 +45,4 @@ class ProfileManager {
         Containers::Array<GameObjects::Profile> _profiles;
 };
 
-}}
+}
diff --git a/src/Managers/Vfs/Directory.h b/src/Managers/Vfs/Directory.h
index 5fd600f..afc8fd7 100644
--- a/src/Managers/Vfs/Directory.h
+++ b/src/Managers/Vfs/Directory.h
@@ -22,7 +22,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Managers { namespace Vfs {
+namespace mbst::Managers::Vfs {
 
 CORRADE_HAS_TYPE(HasFilename, decltype(T::filename));
 
@@ -99,4 +99,4 @@ class Directory {
         Containers::Array<FileType*> _files;
 };
 
-}}}
+}
diff --git a/src/Utilities/Crc32.cpp b/src/Utilities/Crc32.cpp
index f293d98..38378db 100644
--- a/src/Utilities/Crc32.cpp
+++ b/src/Utilities/Crc32.cpp
@@ -16,7 +16,7 @@
 
 #include "Crc32.h"
 
-namespace mbst { namespace Utilities {
+namespace mbst::Utilities {
 
 std::uint32_t
 crc32(std::uint32_t initial, Containers::ArrayView<const void> data) {
@@ -53,4 +53,4 @@ crc32(std::uint32_t initial, Containers::ArrayView<const void> data) {
     return c ^ 0xFFFFFFFF;
 }
 
-}}
+}
diff --git a/src/Utilities/Crc32.h b/src/Utilities/Crc32.h
index d3dc1cf..a0d56e3 100644
--- a/src/Utilities/Crc32.h
+++ b/src/Utilities/Crc32.h
@@ -23,8 +23,8 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Utilities {
+namespace mbst::Utilities {
 
 auto crc32(std::uint32_t initial, Containers::ArrayView<const void> data) -> std::uint32_t;
 
-}}
+}
diff --git a/src/Utilities/Temp.cpp b/src/Utilities/Temp.cpp
index 0a3900f..3e0cdbe 100644
--- a/src/Utilities/Temp.cpp
+++ b/src/Utilities/Temp.cpp
@@ -23,7 +23,7 @@
 
 #include "Temp.h"
 
-namespace mbst { namespace Utilities {
+namespace mbst::Utilities {
 
 Containers::String
 getTempPath(Containers::StringView filename) {
@@ -85,4 +85,4 @@ emptyTempDir() {
     }
 }
 
-}}
+}
diff --git a/src/Utilities/Temp.h b/src/Utilities/Temp.h
index b7e13ba..80ff65a 100644
--- a/src/Utilities/Temp.h
+++ b/src/Utilities/Temp.h
@@ -22,7 +22,7 @@
 
 using namespace Corrade;
 
-namespace mbst { namespace Utilities {
+namespace mbst::Utilities {
 
 auto getTempPath(Containers::StringView filename) -> Containers::String;
 auto copyToTemp(Containers::StringView path) -> Containers::Optional<Containers::String>;
@@ -31,4 +31,4 @@ bool moveFromTemp(Containers::StringView filename, Containers::StringView destin
 bool deleteTempFile(Containers::StringView filename);
 void emptyTempDir();
 
-}}
+}