diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
index ee68fe6..2d5dd12 100644
--- a/MSIBuild/Makefile
+++ b/MSIBuild/Makefile
@@ -1,22 +1,6 @@
-#
+#    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
 #    Copyright © 1991-2021 Amebis
 #    Copyright © 2016 GÉANT
-#
-#    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/>.
-#
 
 !INCLUDE "..\..\..\include\$(PKG)MSIBuildCfg.mak"
 
diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h
index f2409d9..515a4b3 100644
--- a/include/wxex/appbar.h
+++ b/include/wxex/appbar.h
@@ -1,22 +1,8 @@
 /*
+    ​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
     Based on code written by Jeffrey Richter.
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/aui/framemanager.h b/include/wxex/aui/framemanager.h
index 7cfb5b5..adfd176 100644
--- a/include/wxex/aui/framemanager.h
+++ b/include/wxex/aui/framemanager.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/common.h b/include/wxex/common.h
index e7564ae..af85027 100644
--- a/include/wxex/common.h
+++ b/include/wxex/common.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #if !defined(__wxEXTEND_common_h__)
diff --git a/include/wxex/comutils.h b/include/wxex/comutils.h
index 6c12c9c..27768d5 100644
--- a/include/wxex/comutils.h
+++ b/include/wxex/comutils.h
@@ -1,21 +1,7 @@
 /*
+    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/crypto.h b/include/wxex/crypto.h
index 4358ef5..3b76caf 100644
--- a/include/wxex/crypto.h
+++ b/include/wxex/crypto.h
@@ -1,21 +1,7 @@
 /*
+    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/hex.h b/include/wxex/hex.h
index 5a35b56..2ec5cba 100644
--- a/include/wxex/hex.h
+++ b/include/wxex/hex.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/object.h b/include/wxex/object.h
index d803bf4..e0d6d06 100644
--- a/include/wxex/object.h
+++ b/include/wxex/object.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/persist/auimanager.h b/include/wxex/persist/auimanager.h
index d091678..788c394 100644
--- a/include/wxex/persist/auimanager.h
+++ b/include/wxex/persist/auimanager.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/persist/toplevel.h b/include/wxex/persist/toplevel.h
index bbe9360..4c17110 100644
--- a/include/wxex/persist/toplevel.h
+++ b/include/wxex/persist/toplevel.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/private/tlwgeom.h b/include/wxex/private/tlwgeom.h
index dd21636..c0aeb88 100644
--- a/include/wxex/private/tlwgeom.h
+++ b/include/wxex/private/tlwgeom.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/url.h b/include/wxex/url.h
index edb5a84..b721d18 100644
--- a/include/wxex/url.h
+++ b/include/wxex/url.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/valhex.h b/include/wxex/valhex.h
index 20a8a36..b42b677 100644
--- a/include/wxex/valhex.h
+++ b/include/wxex/valhex.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/valnet.h b/include/wxex/valnet.h
index d84bdf8..34a70be 100644
--- a/include/wxex/valnet.h
+++ b/include/wxex/valnet.h
@@ -1,21 +1,7 @@
 /*
+    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/include/wxex/xml.h b/include/wxex/xml.h
index b5b04f9..0057ecc 100644
--- a/include/wxex/xml.h
+++ b/include/wxex/xml.h
@@ -1,21 +1,7 @@
 /*
+    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/res/wxExtend.rc b/res/wxExtend.rc
index ba28472..509cd46 100644
Binary files a/res/wxExtend.rc and b/res/wxExtend.rc differ
diff --git a/src/appbar.cpp b/src/appbar.cpp
index 5f043ae..1c327e5 100644
--- a/src/appbar.cpp
+++ b/src/appbar.cpp
@@ -1,22 +1,8 @@
 /*
+    ​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
     Based on code written by Jeffrey Richter.
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/comutils.cpp b/src/comutils.cpp
index a73ece4..c3d5111 100644
--- a/src/comutils.cpp
+++ b/src/comutils.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/crypto.cpp b/src/crypto.cpp
index ef6cdfa..07bcb86 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/framemanager.cpp b/src/framemanager.cpp
index 776076f..c4b183c 100644
--- a/src/framemanager.cpp
+++ b/src/framemanager.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/hex.cpp b/src/hex.cpp
index d1386f8..1047545 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/pch.cpp b/src/pch.cpp
index cd6c960..ad8fd23 100644
--- a/src/pch.cpp
+++ b/src/pch.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/pch.h b/src/pch.h
index 3841428..759b142 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
diff --git a/src/tlwgeom.cpp b/src/tlwgeom.cpp
index d347fdb..0afc4b4 100644
--- a/src/tlwgeom.cpp
+++ b/src/tlwgeom.cpp
@@ -1,22 +1,8 @@
 /*
+    ​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
     Based on code written by Jeffrey Richter.
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/url.cpp b/src/url.cpp
index bf7ee42..6d5803e 100644
--- a/src/url.cpp
+++ b/src/url.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/valhex.cpp b/src/valhex.cpp
index d820cdd..e772c57 100644
--- a/src/valhex.cpp
+++ b/src/valhex.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/valnet.cpp b/src/valnet.cpp
index 439a138..5b6877d 100644
--- a/src/valnet.cpp
+++ b/src/valnet.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2016-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"
diff --git a/src/xml.cpp b/src/xml.cpp
index 8d6b58c..9113f91 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -1,21 +1,7 @@
 /*
+    ​​​SPDX-License-Identifier: GPL-3.0-or-later
     Copyright © 2015-2021 Amebis
     Copyright © 2016 GÉANT
-
-    This file is part of wxExtend.
-
-    wxExtend 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.
-
-    wxExtend 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 wxExtend. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "pch.h"