diff --git a/feature/feature.xml b/feature/feature.xml
index 73c871f1..3d490f83 100644
--- a/feature/feature.xml
+++ b/feature/feature.xml
@@ -16,12 +16,13 @@ supported!
    </description>
 
    <copyright>
-      Copyright (c) 2014-2019 Andre Bossert.
-
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the &quot;Eclipse Public License
-v2.0&quot; which accompanies this distribution, and is available at
-https://www.eclipse.org/legal/epl-2.0
+      Copyright (c) 2014-2020 Andre Bossert &lt;anb0s@anbos.de&gt;.
+See the NOTICE file(s) distributed with this work for additional
+information regarding copyright ownership.
+This program and the accompanying materials are made available
+under the terms of the Eclipse Public License 2.0 which is available
+at http://www.eclipse.org/legal/epl-2.0
+SPDX-License-Identifier: EPL-2.0
    </copyright>
 
    <license url="https://www.eclipse.org/legal/epl-2.0">
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/Activator.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/Activator.java
index ccf2f26c..a52cb8f4 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/Activator.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/Activator.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/Constants.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/Constants.java
index 81e1e179..87d19271 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/Constants.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/Constants.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/DynamicVariableResolver.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/DynamicVariableResolver.java
index b4367db5..2667074a 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/DynamicVariableResolver.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/DynamicVariableResolver.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/EditorPropertyTester.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/EditorPropertyTester.java
index 635a64cd..6169b5b6 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/EditorPropertyTester.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/EditorPropertyTester.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/Resource.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/Resource.java
index 6deaff19..07696643 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/Resource.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/Resource.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/ResourceUtils.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/ResourceUtils.java
index 4d704e4d..61643b32 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/ResourceUtils.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/ResourceUtils.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/UIMessages.properties b/plugin/src/de/anbos/eclipse/easyshell/plugin/UIMessages.properties
index c9fdb55e..215e59a1 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/UIMessages.properties
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/UIMessages.properties
@@ -1,3 +1,16 @@
+#
+# Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+
 easyshell.plugin.name=EasyShell
 easyshell.properties.main.page.title=EasyShell
 easyshell.properties.commands.page.title=Presets
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/Action.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/Action.java
index 770d8373..4ecd6805 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/Action.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/Action.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.actions;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/ActionDelegate.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/ActionDelegate.java
index 78326e2c..2cac5b82 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/ActionDelegate.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/actions/ActionDelegate.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.actions;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommands.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommands.java
index 5af942e0..1b5bd00a 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommands.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommands.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForDirectory.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForDirectory.java
index 97efb9e2..71ac54e5 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForDirectory.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForDirectory.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForFile.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForFile.java
index eab642c7..6f4acac1 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForFile.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/DefineCommandsForFile.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandDialog.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandDialog.java
index 8e5413fc..d3b7e1e8 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandDialog.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandDialog.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandLabelProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandLabelProvider.java
index da0da918..001f85d8 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandLabelProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandLabelProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandPopup.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandPopup.java
index f2053e25..bec84f03 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandPopup.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/commands/ExecuteCommandPopup.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.commands;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/General.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/General.java
index 81dc5239..98550722 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/General.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/General.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.exceptions;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/UnknownCommandID.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/UnknownCommandID.java
index 3dab4994..14e14cc1 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/UnknownCommandID.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/exceptions/UnknownCommandID.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.exceptions;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/All.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/All.java
index 4e1a8a70..723f9b06 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/All.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/All.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllMulti.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllMulti.java
index 8026b062..c3bb3a1c 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllMulti.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllMulti.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllSingle.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllSingle.java
index c1805f34..d6ef14a7 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllSingle.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/AllSingle.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Clipboard.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Clipboard.java
index 6a083a44..33e25267 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Clipboard.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Clipboard.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Default.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Default.java
index 61c69dfc..93024ec8 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Default.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Default.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Execute.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Execute.java
index 84ee47f1..3b5a7c85 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Execute.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Execute.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Explore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Explore.java
index d95f756b..68393775 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Explore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Explore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Open.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Open.java
index e1a45752..3d8c2690 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Open.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/handlers/Open.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.handlers;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Debug.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Debug.java
index 6ac70fa0..2bc10e16 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Debug.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Debug.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/EasyShellTokenizer.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/EasyShellTokenizer.java
index ce7f01b3..5743c8cc 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/EasyShellTokenizer.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/EasyShellTokenizer.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/LinuxDesktop.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/LinuxDesktop.java
index eb1cf6a2..0d08a6ff 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/LinuxDesktop.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/LinuxDesktop.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PreferenceEntry.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PreferenceEntry.java
index f3c35a92..77a98621 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PreferenceEntry.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PreferenceEntry.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_4.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_4.java
index 2145c82b..b1418da1 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_4.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_4.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_5.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_5.java
index b8051270..1394f63d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_5.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/PrefsV1_5.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Quotes.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Quotes.java
index a4e61aea..1dda5150 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Quotes.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/legacy/Quotes.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.legacy;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/Utils.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/Utils.java
index 1b63fb28..505c88d4 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/Utils.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/Utils.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.misc;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/UtilsUI.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/UtilsUI.java
index 79c6296f..421537fd 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/UtilsUI.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/misc/UtilsUI.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.misc;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandData.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandData.java
index 860dc1fd..097b60df 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandData.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandData.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataBasic.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataBasic.java
index eaa2cf96..a562d589 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataBasic.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataBasic.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataContentProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataContentProvider.java
index 62ad286f..e0c58ea4 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataContentProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataContentProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollection.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollection.java
index d3f2a52f..433f7a70 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollection.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollection.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionAllOS.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionAllOS.java
index c4218b4e..a727c668 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionAllOS.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionAllOS.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionLinux.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionLinux.java
index 6feecf94..e26ad650 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionLinux.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionLinux.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionMacOSX.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionMacOSX.java
index 2d91088a..903f9301 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionMacOSX.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionMacOSX.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionWindows.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionWindows.java
index 5769a0c7..3f8f9f77 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionWindows.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDefaultCollectionWindows.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDialog.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDialog.java
index cd044249..e50cdb0e 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDialog.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataDialog.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataFilter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataFilter.java
index e994caa7..d0c41776 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataFilter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataFilter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataLabelProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataLabelProvider.java
index a0632d80..6d94020d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataLabelProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataLabelProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataList.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataList.java
index 94d1783b..ef6e7bc5 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataList.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataList.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataStore.java
index d8b25fce..094014e2 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandDataStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandPage.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandPage.java
index 7f0167a7..b198f7fa 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandPage.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandPage.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentAdapter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentAdapter.java
index 25ddadcf..d63bd263 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentAdapter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentAdapter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentProposalProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentProposalProvider.java
index f3249a31..9de6e1b5 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentProposalProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/CommandVariableContentProposalProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Data.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Data.java
index 4480e2e7..e706010a 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Data.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Data.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataMover.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataMover.java
index 675e3279..c8eeef32 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataMover.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataMover.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataStore.java
index dedf81ee..02c859a5 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/DataStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralData.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralData.java
index fe16624f..05bd64af 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralData.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralData.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralDataStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralDataStore.java
index 9edbae68..5b5beb8c 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralDataStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/GeneralDataStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IData.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IData.java
index 634885e0..a639d376 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IData.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IData.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IDataStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IDataStore.java
index b38d440b..5f9c7d24 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IDataStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IDataStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IStore.java
index 876eafa7..3ef339c8 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/IStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Initializer.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Initializer.java
index 0f825aed..093d378d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Initializer.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Initializer.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MainPage.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MainPage.java
index dba25db1..8e8b3d5c 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MainPage.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MainPage.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuData.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuData.java
index 5d01532a..f28a2b0b 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuData.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuData.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataContentProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataContentProvider.java
index 4ceb3fa8..cde01e96 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataContentProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataContentProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataDialog.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataDialog.java
index 048fdfb3..7b66a88f 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataDialog.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataDialog.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataFilter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataFilter.java
index d7b8f68c..34bb4227 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataFilter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataFilter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataLabelProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataLabelProvider.java
index 30f3a251..e64b0a9e 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataLabelProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataLabelProvider.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataList.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataList.java
index 9c2d9f6b..069b141b 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataList.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataList.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataMover.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataMover.java
index b46fbba1..006fc783 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataMover.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataMover.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataStore.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataStore.java
index 41a6e6b8..25455a9d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataStore.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuDataStore.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuPage.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuPage.java
index 7eccbce0..bc151855 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuPage.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/MenuPage.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/PreferenceValueConverter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/PreferenceValueConverter.java
index 69c03629..d2523bc5 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/PreferenceValueConverter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/PreferenceValueConverter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Store.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Store.java
index c8bf5cbe..4a165e3c 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Store.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/Store.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBox.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBox.java
index 5e5f582e..ff2b6255 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBox.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBox.java
@@ -1,17 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- *    adapted code from:
- *    http://stackoverflow.com/questions/12511959/is-there-swt-combo-box-with-any-object-as-data-and-labelprovider-for-display
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
  *
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxLabelProvider.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxLabelProvider.java
index 59b0a9cc..f09c7d4a 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxLabelProvider.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxLabelProvider.java
@@ -1,17 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- *    adapted code from:
- *    http://stackoverflow.com/questions/12511959/is-there-swt-combo-box-with-any-object-as-data-and-labelprovider-for-display
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
  *
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxSelectionListener.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxSelectionListener.java
index face2a80..c546140d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxSelectionListener.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/preferences/TypedComboBoxSelectionListener.java
@@ -1,17 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- *    adapted code from:
- *    http://stackoverflow.com/questions/12511959/is-there-swt-combo-box-with-any-object-as-data-and-labelprovider-for-display
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
  *
- *******************************************************************************/
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.preferences;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Category.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Category.java
index 24404cbd..0420c132 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Category.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Category.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandTokenizer.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandTokenizer.java
index b26e4746..98ee2bc1 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandTokenizer.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandTokenizer.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandType.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandType.java
index a16ffd54..d569fc7f 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandType.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/CommandType.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converter.java
index d1532b67..507aaecc 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converters.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converters.java
index 77f354e7..d2d56e76 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converters.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Converters.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Debug.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Debug.java
index ff213a77..3326511f 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Debug.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Debug.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IConverter.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IConverter.java
index 73dc8ac3..73b22456 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IConverter.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IConverter.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IVariableResolver.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IVariableResolver.java
index 15d2d6e3..d46ba2fd 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IVariableResolver.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/IVariableResolver.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/LinuxDesktop.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/LinuxDesktop.java
index 2c11c373..01be6a22 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/LinuxDesktop.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/LinuxDesktop.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/MenuNameType.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/MenuNameType.java
index e07f2210..5909ef0a 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/MenuNameType.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/MenuNameType.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/OS.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/OS.java
index 71f57222..651f012e 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/OS.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/OS.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/PresetType.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/PresetType.java
index 97e92dca..47a820eb 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/PresetType.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/PresetType.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Quotes.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Quotes.java
index 3e6a2189..62d20b86 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Quotes.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Quotes.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/ResourceType.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/ResourceType.java
index 73131a28..f49d3933 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/ResourceType.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/ResourceType.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Tooltip.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Tooltip.java
index d17ce406..18e0fe2b 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Tooltip.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Tooltip.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variable.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variable.java
index e9720ee9..c319294d 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variable.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variable.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variables.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variables.java
index 649c9595..cd379bcf 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variables.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Variables.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;
 
diff --git a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Version.java b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Version.java
index 81e74033..a6b1e58b 100644
--- a/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Version.java
+++ b/plugin/src/de/anbos/eclipse/easyshell/plugin/types/Version.java
@@ -1,13 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 - 2018 Andre Bossert.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/**
+ * Copyright (c) 2014-2020 Andre Bossert <anb0s@anbos.de>.
  *
- * Contributors:
- *    Andre Bossert - initial API and implementation and/or initial documentation
- *******************************************************************************/
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 package de.anbos.eclipse.easyshell.plugin.types;