diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15b3eb4..623682a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,11 @@
 ### Added
 
 - Build for IntelliJ Platform version 212
-- Add hot-reloading where updating the plugin does not require a restart
+- UUID for serializable classes
 
 ### Changed
 
-- Move to Gradle IntelliJ Plugin version 1.0
+- Move to Gradle IntelliJ Plugin version 1.1.4
 
 ### Deprecated
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 134ccb2..572a343 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
     java
-    id("org.jetbrains.intellij") version "1.0"
+    id("org.jetbrains.intellij") version "1.1.4"
     id("org.jetbrains.changelog") version "1.1.2"
 }
 
diff --git a/gradle.properties b/gradle.properties
index 348dd88..8e9d7ba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,6 @@ kpxPluginUntilBuild=212.*
 # See https://jb.gg/intellij-platform-builds-list for available build versions
 kpxPluginVerifierIdeVersions=2021.2
 platformType=IC
-platformVersion=LATEST-EAP-SNAPSHOT
+platformVersion=2021.2
 platformDownloadSources=true
 --add-exports java.base/jdk.internal.vm=ALL-UNNAMED
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index dabb433..06b3d7d 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -15,10 +15,11 @@
     <vendor>halirutan</vendor>
     <depends>com.intellij.modules.lang</depends>
 
-    <applicationListeners>
-        <listener class="de.halirutan.keypromoterx.KeyPromoter"
-                  topic="com.intellij.openapi.actionSystem.ex.AnActionListener"/>
-    </applicationListeners>
+    <application-components>
+        <component>
+            <implementation-class>de.halirutan.keypromoterx.KeyPromoter</implementation-class>
+        </component>
+    </application-components>
 
     <extensions defaultExtensionNs="com.intellij">
         <notificationGroup
diff --git a/src/de/halirutan/keypromoterx/KeyPromoter.java b/src/de/halirutan/keypromoterx/KeyPromoter.java
index 1d0cc05..9913c6b 100644
--- a/src/de/halirutan/keypromoterx/KeyPromoter.java
+++ b/src/de/halirutan/keypromoterx/KeyPromoter.java
@@ -22,7 +22,9 @@
 
 package de.halirutan.keypromoterx;
 
+import com.intellij.application.Topics;
 import com.intellij.ide.ui.UISettings;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ex.AnActionListener;
@@ -49,7 +51,7 @@
  *
  * @author Patrick Scheibe, Dmitry Kashin
  */
-public class KeyPromoter implements AWTEventListener, AnActionListener {
+public class KeyPromoter implements AWTEventListener, AnActionListener, Disposable {
 
   /**
    * Transfers the event to {@link KeyPromoterAction} and inspects the results. Then, depending on the result and the
@@ -73,6 +75,7 @@ private void handleMouseEvent(AWTEvent e) {
 
 
   public KeyPromoter() {
+    Topics.subscribe(AnActionListener.TOPIC, this, this);
     long eventMask = AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK | AWTEvent.WINDOW_EVENT_MASK | AWTEvent.WINDOW_STATE_EVENT_MASK;
     Toolkit.getDefaultToolkit().addAWTEventListener(this, eventMask);
   }
@@ -103,7 +106,6 @@ public void eventDispatched(AWTEvent e) {
   @Override
   public void beforeActionPerformed(@NotNull AnAction action, AnActionEvent event) {
     final InputEvent input = event.getInputEvent();
-
     ActionType type;
     if (input instanceof MouseEvent) {
       type = ActionType.MouseAction;
@@ -183,6 +185,11 @@ private boolean disabledInDistractionFreeMode() {
     return isDistractionFreeMode && keyPromoterSettings.isDisabledInDistractionFreeMode();
   }
 
+  @Override
+  public void dispose() {
+    Toolkit.getDefaultToolkit().removeAWTEventListener(this);
+  }
+
   enum ActionType {
     MouseAction,
     KeyboardAction,
diff --git a/src/de/halirutan/keypromoterx/statistic/StatisticsList.java b/src/de/halirutan/keypromoterx/statistic/StatisticsList.java
index d8dab24..ddebe40 100644
--- a/src/de/halirutan/keypromoterx/statistic/StatisticsList.java
+++ b/src/de/halirutan/keypromoterx/statistic/StatisticsList.java
@@ -32,6 +32,7 @@
  * @author Patrick Scheibe
  */
 public class StatisticsList extends JBList<StatisticsItem> implements PropertyChangeListener {
+    private static final long serialVersionUID = 20212;
     private final DefaultListModel<StatisticsItem> myModel;
     private final KeyPromoterStatistics myStats = ApplicationManager.getApplication().getService(KeyPromoterStatistics.class);
 
@@ -73,6 +74,7 @@ private void updateStats() {
      * Provides custom rendering of items in the Key Promoter X statistic tool-window.
      */
     static class StatisticsItemCellRenderer extends JLabel implements ListCellRenderer<StatisticsItem> {
+        private static final long serialVersionUID = 20212;
 
         @Override
         public JLabel getListCellRendererComponent(JList<? extends StatisticsItem> list, StatisticsItem value, int index, boolean isSelected, boolean cellHasFocus) {
diff --git a/src/de/halirutan/keypromoterx/statistic/SuppressedList.java b/src/de/halirutan/keypromoterx/statistic/SuppressedList.java
index 83e1fcb..61c6082 100644
--- a/src/de/halirutan/keypromoterx/statistic/SuppressedList.java
+++ b/src/de/halirutan/keypromoterx/statistic/SuppressedList.java
@@ -36,6 +36,7 @@
  * @author Patrick Scheibe
  */
 public class SuppressedList extends JBList<StatisticsItem> implements PropertyChangeListener, EventListener {
+    private static final long serialVersionUID = 20212;
     private final KeyPromoterStatistics myStats = ApplicationManager.getApplication().getService(KeyPromoterStatistics.class);
     private final DefaultListModel<StatisticsItem> myModel;
 
@@ -109,6 +110,7 @@ private void unsuppressItem() {
      * Provides custom rendering of items in the Key Promoter X statistic tool-window.
      */
     static class SuppressedItemCellRenderer extends JLabel implements ListCellRenderer<StatisticsItem> {
+        private static final long serialVersionUID = 20212;
 
         SuppressedItemCellRenderer() {
             setOpaque(true);