diff --git a/evil-bookmark.el b/evil-bookmark.el
index 9e342a1..3299590 100644
--- a/evil-bookmark.el
+++ b/evil-bookmark.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs
+;; Keywords: evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-collection.el b/evil-collection.el
index ea05193..e07208b 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs
+;; Keywords: evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-compile.el b/evil-compile.el
index 91810f2..a125326 100644
--- a/evil-compile.el
+++ b/evil-compile.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-debbugs.el b/evil-debbugs.el
index faa7713..606ab0d 100644
--- a/evil-debbugs.el
+++ b/evil-debbugs.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-elfeed.el b/evil-elfeed.el
index 7089e33..e5005e9 100644
--- a/evil-elfeed.el
+++ b/evil-elfeed.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-emms.el b/evil-emms.el
index de71079..99f7cca 100644
--- a/evil-emms.el
+++ b/evil-emms.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-flycheck.el b/evil-flycheck.el
index 3930936..aa9714a 100644
--- a/evil-flycheck.el
+++ b/evil-flycheck.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, flycheck, emacs
+;; Keywords: evil, flycheck
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-ggtags.el b/evil-ggtags.el
index 8c7d64c..8747210 100644
--- a/evil-ggtags.el
+++ b/evil-ggtags.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, ggtags, emacs
+;; Keywords: evil, ggtags
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-helm.el b/evil-helm.el
index dd733ab..d1fd438 100644
--- a/evil-helm.el
+++ b/evil-helm.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-help.el b/evil-help.el
index 17e5be6..1172ce0 100644
--- a/evil-help.el
+++ b/evil-help.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs, help
+;; Keywords: evil, help
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-image+.el b/evil-image+.el
index 01ccd62..cb4bf67 100644
--- a/evil-image+.el
+++ b/evil-image+.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-ivy.el b/evil-ivy.el
index 6c096ec..3a79645 100644
--- a/evil-ivy.el
+++ b/evil-ivy.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs, ivy
+;; Keywords: evil, ivy
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-occur.el b/evil-occur.el
index 90a9b29..6b50265 100644
--- a/evil-occur.el
+++ b/evil-occur.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, occur, emacs
+;; Keywords: evil, occur
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-package-menu.el b/evil-package-menu.el
index 035799e..7048eda 100644
--- a/evil-package-menu.el
+++ b/evil-package-menu.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs, package-menu
+;; Keywords: evil, package-menu
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-pass.el b/evil-pass.el
index 31898d3..ce146d5 100644
--- a/evil-pass.el
+++ b/evil-pass.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, pass, emacs
+;; Keywords: evil, pass
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-pdf.el b/evil-pdf.el
index 7a710a1..ee3c0e6 100644
--- a/evil-pdf.el
+++ b/evil-pdf.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-prodigy.el b/evil-prodigy.el
index 7cecb07..dfd613b 100644
--- a/evil-prodigy.el
+++ b/evil-prodigy.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, prodigy, emacs
+;; Keywords: evil, prodigy
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-profiler.el b/evil-profiler.el
index 4951667..f8383fa 100644
--- a/evil-profiler.el
+++ b/evil-profiler.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs, profiler
+;; Keywords: evil, profiler
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-slime.el b/evil-slime.el
index 01a8b05..7d951d5 100644
--- a/evil-slime.el
+++ b/evil-slime.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, slime, emacs
+;; Keywords: evil, slime
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-term.el b/evil-term.el
index 7758833..10a8a76 100644
--- a/evil-term.el
+++ b/evil-term.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, emacs, term
+;; Keywords: evil, term
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-transmission.el b/evil-transmission.el
index 81ff0aa..e83de14 100644
--- a/evil-transmission.el
+++ b/evil-transmission.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify
diff --git a/evil-vlf.el b/evil-vlf.el
index 1698f10..2d5d612 100644
--- a/evil-vlf.el
+++ b/evil-vlf.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, evil, vlf
+;; Keywords: evil, vlf
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-xref.el b/evil-xref.el
index da05295..19b148c 100644
--- a/evil-xref.el
+++ b/evil-xref.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, evil, xref
+;; Keywords: evil, xref
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/evil-ztree.el b/evil-ztree.el
index c7aed9e..1952a9e 100644
--- a/evil-ztree.el
+++ b/evil-ztree.el
@@ -7,7 +7,7 @@
 ;; URL: https://github.com/jojojames/evil-collection
 ;; Version: 0.0.1
 ;; Package-Requires: ((emacs "25.1"))
-;; Keywords: emacs, compile, evil
+;; Keywords: compile, evil
 ;; HomePage: https://github.com/jojojames/evil-collection
 
 ;; This file is free software; you can redistribute it and/or modify