diff --git a/code/map_data_calc_tools.js b/code/map_data_calc_tools.js
index 8094b53a1..76dbd731c 100755
--- a/code/map_data_calc_tools.js
+++ b/code/map_data_calc_tools.js
@@ -110,31 +110,26 @@ window.getDataZoomForMapZoom = function(zoom) {
     zoom = 21;
   }
 
-
-  if (!window.CONFIG_ZOOM_DEFAULT_DETAIL_LEVEL) {
-
-    // to improve the cacheing performance, we try and limit the number of zoom levels we retrieve data for
-    // to avoid impacting server load, we keep ourselves restricted to a zoom level with the sane numbre
-    // of tilesPerEdge and portal levels visible
-
-    var origTileParams = getMapZoomTileParameters(zoom);
-
-    while (zoom > MIN_ZOOM) {
-      var newTileParams = getMapZoomTileParameters(zoom-1);
-
-      if ( newTileParams.tilesPerEdge != origTileParams.tilesPerEdge
-        || newTileParams.hasPortals != origTileParams.hasPortals
-        || newTileParams.level*newTileParams.hasPortals != origTileParams.level*origTileParams.hasPortals  // multiply by 'hasPortals' bool - so comparison does not matter when no portals available
-      ) {
-        // switching to zoom-1 would result in a different detail level - so we abort changing things
-        break;
-      } else {
-        // changing to zoom = zoom-1 results in identical tile parameters - so we can safely step back
-        // with no increase in either server load or number of requests
-        zoom = zoom-1;
-      }
+  // to improve the cacheing performance, we try and limit the number of zoom levels we retrieve data for
+  // to avoid impacting server load, we keep ourselves restricted to a zoom level with the sane number
+  // of tilesPerEdge and portal levels visible
+
+  var origTileParams = getMapZoomTileParameters(zoom);
+
+  while (zoom > MIN_ZOOM) {
+    var newTileParams = getMapZoomTileParameters(zoom-1);
+
+    if ( newTileParams.tilesPerEdge != origTileParams.tilesPerEdge
+      || newTileParams.hasPortals != origTileParams.hasPortals
+      || newTileParams.level*newTileParams.hasPortals != origTileParams.level*origTileParams.hasPortals  // multiply by 'hasPortals' bool - so comparison does not matter when no portals available
+    ) {
+      // switching to zoom-1 would result in a different detail level - so we abort changing things
+      break;
+    } else {
+      // changing to zoom = zoom-1 results in identical tile parameters - so we can safely step back
+      // with no increase in either server load or number of requests
+      zoom = zoom-1;
     }
-
   }
 
   return zoom;
diff --git a/plugins/compute-ap-stats.user.js b/plugins/ap-stats.user.js
similarity index 99%
rename from plugins/compute-ap-stats.user.js
rename to plugins/ap-stats.user.js
index 81da1aa22..dbebb1db1 100644
--- a/plugins/compute-ap-stats.user.js
+++ b/plugins/ap-stats.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-compute-ap-stats@Hollow011
-// @name           IITC plugin: Compute AP statistics
+// @name           IITC plugin: Available AP statistics
 // @category       Info
 // @version        0.4.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Displays the per-team AP gains available in the current view.
diff --git a/plugins/basemap-gmaps-gray.user.js b/plugins/basemap-google-gray.user.js
similarity index 96%
rename from plugins/basemap-gmaps-gray.user.js
rename to plugins/basemap-google-gray.user.js
index c8f09a326..ff9ff21f4 100644
--- a/plugins/basemap-gmaps-gray.user.js
+++ b/plugins/basemap-google-gray.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-basemap-gmaps-gray@jacob1123
-// @name           IITC plugin: Gray Google Roads
+// @name           IITC plugin: Gray Google map
 // @category       Map Tiles
 // @version        0.1.3.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Add a simplified gray Version of Google map tiles as an optional layer.
diff --git a/plugins/basemap-openstreetmap.user.js b/plugins/basemap-openstreetmap.user.js
index 25000e178..a44d62e8a 100644
--- a/plugins/basemap-openstreetmap.user.js
+++ b/plugins/basemap-openstreetmap.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-basemap-openstreetpam@jonatkins
-// @name           IITC plugin: OpenStreetMap.org map tiles
+// @name           IITC plugin: OpenStreetMap.org map
 // @category       Map Tiles
 // @version        0.1.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Add the native OpenStreetMap.org map tiles as an optional layer.
diff --git a/plugins/bookmarks-by-zaso.css b/plugins/bookmarks.css
similarity index 100%
rename from plugins/bookmarks-by-zaso.css
rename to plugins/bookmarks.css
diff --git a/plugins/bookmarks-by-zaso.user.js b/plugins/bookmarks.user.js
similarity index 99%
rename from plugins/bookmarks-by-zaso.user.js
rename to plugins/bookmarks.user.js
index cd02f51e6..55acd4556 100644
--- a/plugins/bookmarks-by-zaso.user.js
+++ b/plugins/bookmarks.user.js
@@ -1131,7 +1131,7 @@
 /***************************************************************************************************************************************************************/
 
   window.plugin.bookmarks.setupCSS = function() {
-    $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/bookmarks-by-zaso.css@@').appendTo('head');
+    $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/bookmarks.css@@').appendTo('head');
   }
 
   window.plugin.bookmarks.setupPortalsList = function() {
diff --git a/plugins/cache-details-on-map.user.js b/plugins/cache-portals-on-map.user.js
similarity index 94%
rename from plugins/cache-details-on-map.user.js
rename to plugins/cache-portals-on-map.user.js
index 08637bceb..5b1bdf8fb 100644
--- a/plugins/cache-details-on-map.user.js
+++ b/plugins/cache-portals-on-map.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-cache-details-on-map@jonatkins
-// @name           IITC plugin: Cache viewed portal details and always show them on the map
+// @name           IITC plugin: Cache viewed portals on map
 // @category       Cache
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Cache the details of recently viewed portals and use this to populate the map when possible
diff --git a/plugins/cross_link.user.js b/plugins/cross-links.user.js
similarity index 99%
rename from plugins/cross_link.user.js
rename to plugins/cross-links.user.js
index 679849a7d..a04bc2177 100644
--- a/plugins/cross_link.user.js
+++ b/plugins/cross-links.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-cross-links@mcben
-// @name           IITC plugin: cross links
-// @category       Layer
+// @name           IITC plugin: Cross links
+// @category       Draw
 // @version        1.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] EXPERIMENTAL: Checks for existing links that cross planned links. Requires draw-tools plugin.
 @@METAINFO@@
diff --git a/plugins/debug-raw-portal-data.user.js b/plugins/debug-raw-portal-data.user.js
index 5f23ab15d..e4ef7ceff 100644
--- a/plugins/debug-raw-portal-data.user.js
+++ b/plugins/debug-raw-portal-data.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-raw-portal-data
 // @name           IITC plugin: Debug: Raw portal JSON data
-// @category       Debug
+// @category       Portal Info
 // @version        0.2.4.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Developer debugging aid: Add a link to the portal details to show the raw data of a portal.
 @@METAINFO@@
diff --git a/plugins/basemap-nokia-ovi.user.js b/plugins/deleted/basemap-nokia-ovi.user.js
similarity index 100%
rename from plugins/basemap-nokia-ovi.user.js
rename to plugins/deleted/basemap-nokia-ovi.user.js
diff --git a/plugins/basemap-opencyclemap.user.js b/plugins/deleted/basemap-opencyclemap.user.js
similarity index 100%
rename from plugins/basemap-opencyclemap.user.js
rename to plugins/deleted/basemap-opencyclemap.user.js
diff --git a/plugins/canvas-render.user.js b/plugins/deleted/canvas-render.user.js
similarity index 100%
rename from plugins/canvas-render.user.js
rename to plugins/deleted/canvas-render.user.js
diff --git a/plugins/default-intel-detail.user.js b/plugins/deleted/default-intel-detail.user.js
similarity index 100%
rename from plugins/default-intel-detail.user.js
rename to plugins/deleted/default-intel-detail.user.js
diff --git a/plugins/fix-googlemap-china-offset.user.js b/plugins/deleted/fix-googlemap-china-offset.user.js
similarity index 100%
rename from plugins/fix-googlemap-china-offset.user.js
rename to plugins/deleted/fix-googlemap-china-offset.user.js
diff --git a/plugins/force-https.user.js b/plugins/deleted/force-https.user.js
similarity index 100%
rename from plugins/force-https.user.js
rename to plugins/deleted/force-https.user.js
diff --git a/plugins/portal-highlighter-debug.user.js b/plugins/deleted/portal-highlighter-debug.user.js
similarity index 100%
rename from plugins/portal-highlighter-debug.user.js
rename to plugins/deleted/portal-highlighter-debug.user.js
diff --git a/plugins/show-less-portals-zoomed-out.user.js b/plugins/deleted/show-less-portals-zoomed-out.user.js
similarity index 100%
rename from plugins/show-less-portals-zoomed-out.user.js
rename to plugins/deleted/show-less-portals-zoomed-out.user.js
diff --git a/plugins/show-more-portals.user.js b/plugins/deleted/show-more-portals.user.js
similarity index 100%
rename from plugins/show-more-portals.user.js
rename to plugins/deleted/show-more-portals.user.js
diff --git a/plugins/update-check.user.js b/plugins/deleted/update-check.user.js
similarity index 100%
rename from plugins/update-check.user.js
rename to plugins/deleted/update-check.user.js
diff --git a/plugins/done-links.user.js b/plugins/done-links.user.js
index cf78f3955..9dcbd6281 100644
--- a/plugins/done-links.user.js
+++ b/plugins/done-links.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-done-links@jonatkins
-// @name           IITC plugin: done links
-// @category       Layer
+// @name           IITC plugin: Done links
+// @category       Draw
 // @version        0.0.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] A companion to the Cross Links plugin. Highlights any links that match existing draw-tools line/polygon edges
 @@METAINFO@@
diff --git a/plugins/draw-tools.user.js b/plugins/draw-tools.user.js
index 6223a0517..d235c8733 100644
--- a/plugins/draw-tools.user.js
+++ b/plugins/draw-tools.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-draw-tools@breunigs
-// @name           IITC plugin: draw tools
-// @category       Layer
+// @name           IITC plugin: Draw tools
+// @category       Draw
 // @version        0.7.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Allow drawing things onto the current map so you may plan your next move.
 @@METAINFO@@
diff --git a/plugins/layer-farms-find.user.js b/plugins/farms-find.user.js
similarity index 98%
rename from plugins/layer-farms-find.user.js
rename to plugins/farms-find.user.js
index e138aa412..8d504b41d 100644
--- a/plugins/layer-farms-find.user.js
+++ b/plugins/farms-find.user.js
@@ -1,9 +1,9 @@
 // ==UserScript==
 // @id             iitc-plugin-farms@949
-// @name           IITC plugin: Show farms by level
-// @category       Info
+// @name           IITC plugin: Find farms on map
+// @category       Layer
 // @version        1.4.1.@@DATETIMEVERSION@@
-// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Find farms by minimum level.
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show farms by minimum level
 @@METAINFO@@
 // ==/UserScript==
 
diff --git a/plugins/fly-links.user.js b/plugins/fly-links.user.js
index 9250f33bc..cc347984a 100644
--- a/plugins/fly-links.user.js
+++ b/plugins/fly-links.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             fly-links@fly
 // @name           IITC plugin: Fly Links
-// @category       Layer
+// @category       Draw
 // @version        0.2.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Calculate how to link the portals to create the largest tidy set of nested fields. Enable from the layer chooser.
 @@METAINFO@@
diff --git a/plugins/portal-highlighter-forgotten.user.js b/plugins/highlight-forgotten.user.js
similarity index 93%
rename from plugins/portal-highlighter-forgotten.user.js
rename to plugins/highlight-forgotten.user.js
index b74a356e6..afb6d3a49 100644
--- a/plugins/portal-highlighter-forgotten.user.js
+++ b/plugins/highlight-forgotten.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-forgotten@jonatkins
-// @name           IITC plugin: Inactive portals. Hightlight unclaimed portals with no recent activity
+// @name           IITC plugin: Highlight inactive portals
 // @category       Highlighter
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote if the portal is unclaimed with no recent activity. Shades of red from one week to one month, then tinted to purple for longer. May also highlight captured portals that are stuck and fail to decay every 24 hours.
diff --git a/plugins/portal-highlighter-hide-team.user.js b/plugins/highlight-hide-team.user.js
similarity index 100%
rename from plugins/portal-highlighter-hide-team.user.js
rename to plugins/highlight-hide-team.user.js
diff --git a/plugins/portal-highlighter-high-level.user.js b/plugins/highlight-high-level.user.js
similarity index 94%
rename from plugins/portal-highlighter-high-level.user.js
rename to plugins/highlight-high-level.user.js
index b9cd7ee94..1f00078ff 100644
--- a/plugins/portal-highlighter-high-level.user.js
+++ b/plugins/highlight-high-level.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-portals-high-level
-// @name           IITC plugin: highlight high level portals
+// @name           IITC plugin: Highlight high level portals
 // @category       Highlighter
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote high level portals: Purple L8, Red L7, Orange L6
diff --git a/plugins/portal-highlighter-infrastructure.user.js b/plugins/highlight-infrastructure.user.js
similarity index 96%
rename from plugins/portal-highlighter-infrastructure.user.js
rename to plugins/highlight-infrastructure.user.js
index 3a9f3611a..e4a355a8b 100644
--- a/plugins/portal-highlighter-infrastructure.user.js
+++ b/plugins/highlight-infrastructure.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-portal-infrastructure@vita10gy
-// @name           IITC plugin: highlight portals with infrastructure problems
+// @name           IITC plugin: Highlight portals with infrastructure problems
 // @category       Highlighter
 // @version        0.2.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote if the portal has any infrastructure problems. Red: no picture. Yellow: potential title issue. Orange:  both of these.
diff --git a/plugins/portal-highlighter-level-color.user.js b/plugins/highlight-level-color.user.js
similarity index 94%
rename from plugins/portal-highlighter-level-color.user.js
rename to plugins/highlight-level-color.user.js
index 602a04cba..a2e50e5b7 100644
--- a/plugins/portal-highlighter-level-color.user.js
+++ b/plugins/highlight-level-color.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-portals-level-color@vita10gy
-// @name           IITC plugin: highlight portals by level color
+// @name           IITC plugin: Highlight portals by level color
 // @category       Highlighter
 // @version        0.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote the portal level by using the game level colors.
diff --git a/plugins/portal-highlighter-missing-resonators.user.js b/plugins/highlight-missing-resonators.user.js
similarity index 95%
rename from plugins/portal-highlighter-missing-resonators.user.js
rename to plugins/highlight-missing-resonators.user.js
index 8abb65086..2442ad00b 100644
--- a/plugins/portal-highlighter-missing-resonators.user.js
+++ b/plugins/highlight-missing-resonators.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-portals-missing-resonators@vita10gy
-// @name           IITC plugin: highlight portals missing resonators
+// @name           IITC plugin: Highlight portals missing resonators
 // @category       Highlighter
 // @version        0.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote if the portal is missing resonators. 
diff --git a/plugins/portal-highlighter-needs-recharge.user.js b/plugins/highlight-needs-recharge.user.js
similarity index 95%
rename from plugins/portal-highlighter-needs-recharge.user.js
rename to plugins/highlight-needs-recharge.user.js
index e5454e461..d7db8b330 100644
--- a/plugins/portal-highlighter-needs-recharge.user.js
+++ b/plugins/highlight-needs-recharge.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-needs-recharge@vita10gy
-// @name           IITC plugin: hightlight portals that need recharging
+// @name           IITC plugin: Highlight portals that need recharging
 // @category       Highlighter
 // @version        0.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote if the portal needs recharging and how much. Yellow: above 85%. Orange: above 50%. Red: above 15%. Magenta: below 15%.
diff --git a/plugins/portal-highlighter-ornaments.user.js b/plugins/highlight-ornaments.user.js
similarity index 94%
rename from plugins/portal-highlighter-ornaments.user.js
rename to plugins/highlight-ornaments.user.js
index c01d526d8..847039add 100644
--- a/plugins/portal-highlighter-ornaments.user.js
+++ b/plugins/highlight-ornaments.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-ornaments@jonatkins
-// @name           IITC plugin: hightlight portals with ornaments
+// @name           IITC plugin: Highlight portals with ornaments
 // @category       Highlighter
 // @version        0.0.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote portals with additional 'ornament' markers. e.g. Anomaly portals
diff --git a/plugins/portal-highlighter-portals-my-level.user.js b/plugins/highlight-portals-my-level.user.js
similarity index 96%
rename from plugins/portal-highlighter-portals-my-level.user.js
rename to plugins/highlight-portals-my-level.user.js
index 94040ad15..f431dafa8 100644
--- a/plugins/portal-highlighter-portals-my-level.user.js
+++ b/plugins/highlight-portals-my-level.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-highlight-portals-my-level@vita10gy
-// @name           IITC plugin: highlight portals by my level
+// @name           IITC plugin: Highlight portals by my level
 // @category       Highlighter
 // @version        0.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the portal fill color to denote if the portal is either at and above, or at and below your level.
diff --git a/plugins/show-portal-weakness.user.js b/plugins/highlight-weakness.user.js
similarity index 96%
rename from plugins/show-portal-weakness.user.js
rename to plugins/highlight-weakness.user.js
index 6ee6e734b..c7e92aeb2 100644
--- a/plugins/show-portal-weakness.user.js
+++ b/plugins/highlight-weakness.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-show-portal-weakness@vita10gy
-// @name           IITC plugin: show portal weakness
+// @name           IITC plugin: Highlight portal weakness
 // @category       Highlighter
 // @version        0.7.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Use the fill color of the portals to denote if the portal is weak. Stronger red indicates recharge required, missing resonators, or both.
diff --git a/plugins/keys-on-map.user.js b/plugins/keys-on-map.user.js
index 9dd212139..d75fd1fe3 100644
--- a/plugins/keys-on-map.user.js
+++ b/plugins/keys-on-map.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-keys-on-map@xelio
 // @name           IITC plugin: Keys on map
-// @category       Keys
+// @category       Layer
 // @version        0.2.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show the manually entered key counts from the 'keys' plugin on the map.
 @@METAINFO@@
diff --git a/plugins/keys.user.js b/plugins/keys.user.js
index aea5f6627..691e0a74b 100644
--- a/plugins/keys.user.js
+++ b/plugins/keys.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-keys@xelio
 // @name           IITC plugin: Keys
-// @category       Keys
+// @category       Misc
 // @version        0.3.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Allow manual entry of key counts for each portal. Use the 'keys-on-map' plugin to show the numbers on the map, and 'sync' to share between multiple browsers or desktop/mobile.
 @@METAINFO@@
diff --git a/plugins/layer-count.user.js b/plugins/layer-count.user.js
index 0dd6321f6..210001fba 100644
--- a/plugins/layer-count.user.js
+++ b/plugins/layer-count.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             layer-count@fkloft
-// @name           IITC plugin: layer count
+// @name           IITC plugin: Layer count
 // @category       Info
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Allow users to count nested fields
diff --git a/plugins/link-show-direction.user.js b/plugins/link-show-direction.user.js
index 750e461d3..af7f70159 100644
--- a/plugins/link-show-direction.user.js
+++ b/plugins/link-show-direction.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-link-show-direction
-// @name           IITC plugin: Show the direction of links on the map
+// @name           IITC plugin: Direction of links on map
 // @category       Tweaks
 // @version        0.2.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show the direction of links on the map by adding short dashes to the line at the origin portal.
diff --git a/plugins/show-linked-portals.css b/plugins/linked-portals-show.css
similarity index 100%
rename from plugins/show-linked-portals.css
rename to plugins/linked-portals-show.css
diff --git a/plugins/show-linked-portals.user.js b/plugins/linked-portals-show.user.js
similarity index 98%
rename from plugins/show-linked-portals.user.js
rename to plugins/linked-portals-show.user.js
index d9890d218..ecf9aad63 100644
--- a/plugins/show-linked-portals.user.js
+++ b/plugins/linked-portals-show.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-show-linked-portals@fstopienski
-// @name           IITC plugin: Show linked portals
+// @name           IITC plugin: Linked portals
 // @category       Portal Info
 // @version        0.3.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Try to show the linked portals (image, name and link direction) in portal detail view and jump to linked portal on click.  Some details may not be available if the linked portal is not in the current view.
@@ -174,7 +174,7 @@ plugin.showLinkedPortal.removePreview = function() {
 
 var setup = function () {
   window.addHook('portalDetailsUpdated', window.plugin.showLinkedPortal.portalDetail);
-  $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/show-linked-portals.css@@').appendTo('head');
+  $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/linked-portals-show.css@@').appendTo('head');
 }
 
 // PLUGIN END //////////////////////////////////////////////////////////
diff --git a/plugins/add-kml.user.js b/plugins/overlay-kml.user.js
similarity index 98%
rename from plugins/add-kml.user.js
rename to plugins/overlay-kml.user.js
index 31a374dac..eb8ff9d8d 100644
--- a/plugins/add-kml.user.js
+++ b/plugins/overlay-kml.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             overlay-kml@danielatkins
-// @name           IITC plugin: overlay KML
+// @name           IITC plugin: Overlay KML
 // @category       Layer
 // @version        0.2.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Allow users to overlay their own KML / GPX files on top of IITC.
diff --git a/plugins/pan-control.user.js b/plugins/pan-control.user.js
index dee4ce2ea..0208a8ed8 100644
--- a/plugins/pan-control.user.js
+++ b/plugins/pan-control.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-pan-control@fragger
-// @name           IITC plugin: pan control
+// @name           IITC plugin: Pan control
 // @category       Controls
 // @version        0.1.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show a panning control on the map.
diff --git a/plugins/player-tracker.user.js b/plugins/player-activity-tracker.user.js
similarity index 99%
rename from plugins/player-tracker.user.js
rename to plugins/player-activity-tracker.user.js
index 29d41c81f..7d8182bf1 100644
--- a/plugins/player-tracker.user.js
+++ b/plugins/player-activity-tracker.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-player-tracker@breunigs
-// @name           IITC Plugin: Player tracker
+// @name           IITC Plugin: Player activity tracker
 // @category       Layer
 // @version        0.11.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Draw trails for the path a user took onto the map based on status messages in COMMs. Uses up to three hours of data. Does not request chat data on its own, even if that would be useful.
diff --git a/plugins/guess-player-levels.user.js b/plugins/player-level-guess.user.js
similarity index 99%
rename from plugins/guess-player-levels.user.js
rename to plugins/player-level-guess.user.js
index 9213eecb7..7ee63e0b5 100644
--- a/plugins/guess-player-levels.user.js
+++ b/plugins/player-level-guess.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-guess-player-levels@breunigs
-// @name           IITC plugin: guess player level
+// @name           IITC plugin: Player level guess
 // @category       Info
 // @version        0.5.7.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Try to determine player levels from the data available in the current view.
diff --git a/plugins/portal-counts.user.js b/plugins/portal-counts.user.js
index 3cdd55a5a..868fd7296 100644
--- a/plugins/portal-counts.user.js
+++ b/plugins/portal-counts.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-portals-count@yenky
-// @name           IITC plugin: Show total counts of portals
+// @name           IITC plugin: Portal count
 // @category       Info
 // @version        0.1.2.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Display a list of all localized portals by level and faction.
diff --git a/plugins/portals-list.user.js b/plugins/portals-list.user.js
index 34dedd448..8b49876b5 100644
--- a/plugins/portals-list.user.js
+++ b/plugins/portals-list.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-portals-list@teo96
-// @name           IITC plugin: show list of portals
+// @name           IITC plugin: Portals list
 // @category       Info
 // @version        0.2.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Display a sortable list of all visible portals with full details about the team, resonators, links, etc.
diff --git a/plugins/privacy-view.user.js b/plugins/privacy-view.user.js
index 6545bf09c..a4935176a 100644
--- a/plugins/privacy-view.user.js
+++ b/plugins/privacy-view.user.js
@@ -1,6 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-privacy-view@Scrool
 // @name           IITC plugin: Privacy view on Intel
+// @category       Misc
 // @version        1.0.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Hide info from intel which shouldn't leak to players of the other faction.
 @@METAINFO@@
diff --git a/plugins/regions.user.js b/plugins/regions.user.js
index c317f1925..68f0c1b89 100644
--- a/plugins/regions.user.js
+++ b/plugins/regions.user.js
@@ -1,9 +1,9 @@
 // ==UserScript==
 // @id             iitc-plugin-regions@jonatkins
-// @name           IITC plugin: Show the local score regions
+// @name           IITC plugin: Ingress scoring regions
 // @category       Layer
 // @version        0.1.2.@@DATETIMEVERSION@@
-// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show the local scoring regions on the map. No actual scores - just the region areas.
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show the regional scoring cells grid on the map
 @@METAINFO@@
 // ==/UserScript==
 
diff --git a/plugins/reso-energy-pct-in-portal-detail.user.js b/plugins/reso-energy-pct-in-portal-detail.user.js
index 776730b78..ea4bc5cd2 100644
--- a/plugins/reso-energy-pct-in-portal-detail.user.js
+++ b/plugins/reso-energy-pct-in-portal-detail.user.js
@@ -1,9 +1,9 @@
 // ==UserScript==
 // @id             iitc-plugin-reso-energy-pct-in-portal-detail@xelio
-// @name           IITC plugin: reso energy pct in portal detail
+// @name           IITC plugin: Reso energy % in portal details
 // @category       Portal Info
 // @version        0.1.2.@@DATETIMEVERSION@@
-// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show resonator energy percentage on resonator energy bar in portal detail panel.
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show resonator energy percentage on resonator energy bar in portal details panel.
 @@METAINFO@@
 // ==/UserScript==
 
diff --git a/plugins/scale-bar.user.js b/plugins/scale-bar.user.js
index cbf038c8d..62edcb5a1 100644
--- a/plugins/scale-bar.user.js
+++ b/plugins/scale-bar.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-scale-bar@breunigs
-// @name           IITC plugin: scale bar
+// @name           IITC plugin: Scale bar
 // @category       Controls
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show scale bar on the map.
diff --git a/plugins/score-cycle-times.user.js b/plugins/score-cycle-times.user.js
index 8ee6aecd4..42199585b 100644
--- a/plugins/score-cycle-times.user.js
+++ b/plugins/score-cycle-times.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-score-cycle-times@jonatkins
-// @name           IITC plugin: Show scoreboard cycle/checkpoint times
+// @name           IITC plugin: Scoring cycle / checkpoint times
 // @category       Info
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show the times used for the septicycle and checkpoints for regional scoreboards.
diff --git a/plugins/scoreboard.user.js b/plugins/scoreboard.user.js
index ce556b7b5..ebfa67024 100644
--- a/plugins/scoreboard.user.js
+++ b/plugins/scoreboard.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-scoreboard@vita10gy
-// @name           IITC plugin: show a localized scoreboard.
+// @name           IITC plugin: Localized scoreboard
 // @version        0.2.0.@@DATETIMEVERSION@@
 // @category       Info
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Display a scoreboard about all visible portals with statistics about both teams,like average portal level,link & field counts etc.
diff --git a/plugins/scroll-wheel-zoom-disable.user.js b/plugins/scroll-wheel-zoom-disable.user.js
index 3120eb50e..b22f76647 100644
--- a/plugins/scroll-wheel-zoom-disable.user.js
+++ b/plugins/scroll-wheel-zoom-disable.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-scroll-wheel-zoom-disable@jonatkins
-// @name           IITC plugin: disable mouse wheel zoom
+// @name           IITC plugin: Disable mouse wheel zoom
 // @category       Tweaks
 // @version        0.1.0.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Disable the use of mouse wheel to zoom. The map zoom controls or keyboard are still available.
diff --git a/plugins/speech-search.user.js b/plugins/speech-search.user.js
index 40bcf09ba..c929a2072 100644
--- a/plugins/speech-search.user.js
+++ b/plugins/speech-search.user.js
@@ -1,6 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-speech-search
 // @name           IITC Plugin: Speech Search
+// @category       Misc
 // @version        0.0.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Allow speech input for location search (webkit only for now - NOT Firefox).
 @@METAINFO@@
diff --git a/plugins/max-links.user.js b/plugins/tidy-links.user.js
similarity index 52%
rename from plugins/max-links.user.js
rename to plugins/tidy-links.user.js
index f2a944cf5..240fb28a3 100644
--- a/plugins/max-links.user.js
+++ b/plugins/tidy-links.user.js
@@ -1,9 +1,9 @@
 // ==UserScript==
-// @id             max-links@boombuler
-// @name           IITC plugin: Max Links
-// @category       Layer
+// @id             tidy-links@boombuler
+// @name           IITC plugin: Tidy Links
+// @category       Draw
 // @version        0.4.3.@@DATETIMEVERSION@@
-// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Calculate how to link the portals to create a reasonably tidy set of links/fields. Enable from the layer chooser. (Max Links is a poor name, but remains for historical reasons.)
+// @description    [@@BUILDNAME@@-@@BUILDDATE@@] Calculate how to link the portals to create a reasonably tidy set of links/fields. Enable from the layer chooser. (former `Max Links`)
 @@METAINFO@@
 // ==/UserScript==
 
@@ -12,14 +12,14 @@
 // PLUGIN START ////////////////////////////////////////////////////////
 
 // use own namespace for plugin
-window.plugin.maxLinks = function() {};
+window.plugin.tidyLinks = function() {};
 
 // const values
-window.plugin.maxLinks.MAX_PORTALS_TO_LINK = 200;
+window.plugin.tidyLinks.MAX_PORTALS_TO_LINK = 200;
 // zoom level used for projecting points between latLng and pixel coordinates. may affect precision of triangulation
-window.plugin.maxLinks.PROJECT_ZOOM = 16;
+window.plugin.tidyLinks.PROJECT_ZOOM = 16;
 
-window.plugin.maxLinks.STROKE_STYLE = {
+window.plugin.tidyLinks.STROKE_STYLE = {
   color: '#FF0000',
   opacity: 1,
   weight: 1.5,
@@ -27,40 +27,40 @@ window.plugin.maxLinks.STROKE_STYLE = {
   dashArray: '6,4',
   smoothFactor: 10,
 };
-window.plugin.maxLinks.layer = null;
-window.plugin.maxLinks.errorMarker = null;
+window.plugin.tidyLinks.layer = null;
+window.plugin.tidyLinks.errorMarker = null;
 
 
 
-window.plugin.maxLinks.addErrorMarker = function() {
-  if (window.plugin.maxLinks.errorMarker == null) {
-    window.plugin.maxLinks.errorMarker = L.marker (window.map.getCenter(), {
+window.plugin.tidyLinks.addErrorMarker = function() {
+  if (window.plugin.tidyLinks.errorMarker == null) {
+    window.plugin.tidyLinks.errorMarker = L.marker (window.map.getCenter(), {
       icon: L.divIcon({
-        className: 'max-links-error',
+        className: 'tidy-links-error',
         iconSize: [300,30],
         html: 'Tidy Links: too many portals!'
       }),
       interactive: false
     });
 
-    window.map.addLayer(window.plugin.maxLinks.errorMarker);
+    window.map.addLayer(window.plugin.tidyLinks.errorMarker);
   }
 
 }
 
-window.plugin.maxLinks.clearErrorMarker = function() {
-  if (window.plugin.maxLinks.errorMarker != null) {
-    window.map.removeLayer(window.plugin.maxLinks.errorMarker);
-    window.plugin.maxLinks.errorMarker = null;
+window.plugin.tidyLinks.clearErrorMarker = function() {
+  if (window.plugin.tidyLinks.errorMarker != null) {
+    window.map.removeLayer(window.plugin.tidyLinks.errorMarker);
+    window.plugin.tidyLinks.errorMarker = null;
   }
 }
 
 
-window.plugin.maxLinks.updateLayer = function() {
-  if (!window.map.hasLayer(window.plugin.maxLinks.layer))
+window.plugin.tidyLinks.updateLayer = function() {
+  if (!window.map.hasLayer(window.plugin.tidyLinks.layer))
     return;
 
-  window.plugin.maxLinks.layer.clearLayers();
+  window.plugin.tidyLinks.layer.clearLayers();
 
   var locations = [];
 
@@ -68,14 +68,14 @@ window.plugin.maxLinks.updateLayer = function() {
   $.each(window.portals, function(guid, portal) {
     var ll = portal.getLatLng();
     if (bounds.contains(ll)) {
-      var p = map.project (portal.getLatLng(), window.plugin.maxLinks.PROJECT_ZOOM);
+      var p = map.project (portal.getLatLng(), window.plugin.tidyLinks.PROJECT_ZOOM);
       locations.push(p);
-      if (locations.length > window.plugin.maxLinks.MAX_PORTALS_TO_LINK) return false; //$.each break
+      if (locations.length > window.plugin.tidyLinks.MAX_PORTALS_TO_LINK) return false; //$.each break
     }
   });
 
-  if (locations.length > window.plugin.maxLinks.MAX_PORTALS_TO_LINK) {
-    window.plugin.maxLinks.addErrorMarker();
+  if (locations.length > window.plugin.tidyLinks.MAX_PORTALS_TO_LINK) {
+    window.plugin.tidyLinks.addErrorMarker();
     return;
   }
 
@@ -110,11 +110,11 @@ window.plugin.maxLinks.updateLayer = function() {
       drawnLinks[a][b] = null;
 
       // convert back from x/y coordinates to lat/lng for drawing
-      var alatlng = map.unproject (a, window.plugin.maxLinks.PROJECT_ZOOM);
-      var blatlng = map.unproject (b, window.plugin.maxLinks.PROJECT_ZOOM);
+      var alatlng = map.unproject (a, window.plugin.tidyLinks.PROJECT_ZOOM);
+      var blatlng = map.unproject (b, window.plugin.tidyLinks.PROJECT_ZOOM);
 
-      var poly = L.polyline([alatlng, blatlng], window.plugin.maxLinks.STROKE_STYLE);
-      poly.addTo(window.plugin.maxLinks.layer);
+      var poly = L.polyline([alatlng, blatlng], window.plugin.tidyLinks.STROKE_STYLE);
+      poly.addTo(window.plugin.tidyLinks.layer);
       drawnLinkCount++;
     }
   }
@@ -126,39 +126,39 @@ window.plugin.maxLinks.updateLayer = function() {
   });
 }
 
-window.plugin.maxLinks.setup = function() {
+window.plugin.tidyLinks.setup = function() {
   try { console.log('Loading delaunay JS now'); } catch(e) {}
   @@INCLUDERAW:external/delaunay.js@@
   try { console.log('done loading delaunay JS'); } catch(e) {}
 
-  window.plugin.maxLinks.layer = L.layerGroup([]);
+  window.plugin.tidyLinks.layer = L.layerGroup([]);
 
   window.addHook('mapDataRefreshEnd', function(e) {
-    window.plugin.maxLinks.updateLayer();
+    window.plugin.tidyLinks.updateLayer();
   });
 
   window.addHook('mapDataRefreshStart', function(e) {
-    window.plugin.maxLinks.clearErrorMarker();
+    window.plugin.tidyLinks.clearErrorMarker();
   });
 
   window.map.on('layeradd', function(e) {
-    if (e.layer === window.plugin.maxLinks.layer)
-      window.plugin.maxLinks.updateLayer();
+    if (e.layer === window.plugin.tidyLinks.layer)
+      window.plugin.tidyLinks.updateLayer();
   });
   window.map.on('layerremove', function(e) {
-    if (e.layer === window.plugin.maxLinks.layer)
-      window.plugin.maxLinks.clearErrorMarker();
+    if (e.layer === window.plugin.tidyLinks.layer)
+      window.plugin.tidyLinks.clearErrorMarker();
   });
 
-  window.addLayerGroup('Tidy Links (was Max Links)', window.plugin.maxLinks.layer, false);
+  window.addLayerGroup('Tidy Links', window.plugin.tidyLinks.layer, false);
 
   $('head').append('<style>'+
-    '.max-links-error { color: #F88; font-size: 20px; font-weight: bold; text-align: center; text-shadow: -1px -1px #000, 1px -1px #000, -1px 1px #000, 1px 1px #000; background-color: rgba(0,0,0,0.6); border-radius: 5px; }'+
+    '.tidy-links-error { color: #F88; font-size: 20px; font-weight: bold; text-align: center; text-shadow: -1px -1px #000, 1px -1px #000, -1px 1px #000, 1px 1px #000; background-color: rgba(0,0,0,0.6); border-radius: 5px; }'+
     '</style>');
 
 
 }
-var setup = window.plugin.maxLinks.setup;
+var setup = window.plugin.tidyLinks.setup;
 
 // PLUGIN END //////////////////////////////////////////////////////////
 
diff --git a/plugins/zoom-slider.user.js b/plugins/zoom-slider.user.js
index c416f7c20..6a469190a 100644
--- a/plugins/zoom-slider.user.js
+++ b/plugins/zoom-slider.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @id             iitc-plugin-zoom-slider@fragger
-// @name           IITC plugin: zoom slider
+// @name           IITC plugin: Zoom slider
 // @category       Controls
 // @version        0.1.1.@@DATETIMEVERSION@@
 // @description    [@@BUILDNAME@@-@@BUILDDATE@@] Show a zoom slider on the map instead of the zoom buttons.