diff --git a/MSICA/MSIBuild/Makefile b/MSICA/MSIBuild/Makefile
index e475fad..daaea4d 100644
Binary files a/MSICA/MSIBuild/Makefile and b/MSICA/MSIBuild/Makefile differ
diff --git a/MSICA/MSICA.cpp b/MSICA/MSICA.cpp
index 44a439f..f38f4e3 100644
--- a/MSICA/MSICA.cpp
+++ b/MSICA/MSICA.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/MSICA/MSICA.h b/MSICA/MSICA.h
index 87bc9e8..3471d97 100644
--- a/MSICA/MSICA.h
+++ b/MSICA/MSICA.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __MSICA_H__
diff --git a/MSICA/pch.cpp b/MSICA/pch.cpp
index 8870aef..cdf9bd2 100644
--- a/MSICA/pch.cpp
+++ b/MSICA/pch.cpp
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/MSICA/pch.h b/MSICA/pch.h
index 2c98b02..bf1965f 100644
--- a/MSICA/pch.h
+++ b/MSICA/pch.h
@@ -1,20 +1,6 @@
 /*
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/MSICA/res/MSICA.rc b/MSICA/res/MSICA.rc
index 8f51f7c..de55797 100644
Binary files a/MSICA/res/MSICA.rc and b/MSICA/res/MSICA.rc differ
diff --git a/include/ARM64.props b/include/ARM64.props
index a58540d..386abe3 100644
--- a/include/ARM64.props
+++ b/include/ARM64.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/Debug.props b/include/Debug.props
index 638bf12..9398d3e 100644
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
diff --git a/include/Release.props b/include/Release.props
index cf04cd0..a4f4abd 100644
--- a/include/Release.props
+++ b/include/Release.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
diff --git a/include/Win32.props b/include/Win32.props
index 5a185b1..59eb1c0 100644
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/common.props b/include/common.props
index 7fd56a4..e3c2349 100644
--- a/include/common.props
+++ b/include/common.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="ExtensionSettings">
diff --git a/include/x64.props b/include/x64.props
index dc7da5d..8427fb5 100644
--- a/include/x64.props
+++ b/include/x64.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/xgettext.props b/include/xgettext.props
index 43dd328..66457e7 100644
--- a/include/xgettext.props
+++ b/include/xgettext.props
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of MSICA.
-
-    MSICA is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MSICA is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(POCompileBeforeTargets)' == '' and '$(POCompileAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
diff --git a/include/xgettext.targets b/include/xgettext.targets
index 45101c7..a36e9b9 100644
--- a/include/xgettext.targets
+++ b/include/xgettext.targets
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
diff --git a/include/xgettext.xml b/include/xgettext.xml
index aee220d..e143967 100644
--- a/include/xgettext.xml
+++ b/include/xgettext.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+    SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 1991-2021 Amebis
-
-    This file is part of ZRCola.
-
-    ZRCola is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    ZRCola is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 -->
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
   <Rule Name="POCompile" PageTemplate="tool" DisplayName="PO Compiler" SwitchPrefix="--" Order="200">
diff --git a/lib/MSICALib b/lib/MSICALib
index bc9f4de..a281a9a 160000
--- a/lib/MSICALib
+++ b/lib/MSICALib
@@ -1 +1 @@
-Subproject commit bc9f4de093751db99cd8cb4627c75aab9b4a1bf4
+Subproject commit a281a9aae39a239b12bce82ce4b886b83969beca