diff --git a/_data/notices.yaml b/_data/notices.yaml
index 499d5c611eb..d4ef563b68f 100644
--- a/_data/notices.yaml
+++ b/_data/notices.yaml
@@ -53,8 +53,8 @@
     settings. The release notes of the version by the new maintainer can be found at the "Read more..." link below.
   link: https://github.com/AliceGrey/OctoprintKlipperPlugin/releases/tag/0.3.1
 - plugin: costestimation
-  pluginversions: ["<3.0.0"]
-  versions: ["0.3.0", "0.4.0", "1.0.0", "1.1.0", "2.0.0", "2.0.1", "2.1.0", "2.1.1", "2.1.2", "2.1.3"]
+  pluginversions: ["<3.5.1"]
+  versions: ["0.3.0", "0.4.0", "1.0.0", "1.1.0", "2.0.0", "2.0.1", "2.1.0", "2.1.1", "2.1.2", "2.1.3", "3.0.0", "3.1.0", "3.2.0", "3.3.0", "3.4.0", "3.5.0"]
   date: 2020-09-22 08:45:00Z
   text: Version 3.0.0 of this plugin is available from a new maintainer, but your version still looks for updates at the
     repository of the old maintainer. Please re-install the plugin from the repository to update, keeping your
diff --git a/_data/update_check_overlays.yaml b/_data/update_check_overlays.yaml
index 70c5a49d956..10a36a6bf8d 100644
--- a/_data/update_check_overlays.yaml
+++ b/_data/update_check_overlays.yaml
@@ -17,7 +17,7 @@ filamentmanager:
 klipper:
   user: AliceGrey
 costestimation:
-  user: OllisGit
+  user: Hillshum
 filamentreload:
   user: nickmitchko
 eeprom_marlin:
diff --git a/_plugins/costestimation.md b/_plugins/costestimation.md
index 90f28e71001..1921f501f80 100644
--- a/_plugins/costestimation.md
+++ b/_plugins/costestimation.md
@@ -5,13 +5,14 @@ id: costestimation
 title: CostEstimation
 description: Displays the estimated print cost for the loaded model
 authors:
+- Hilton Shumway
 - Sven Lohrmann
 - Olli
 license: AGPLv3
 date: 2017-07-16
-homepage: https://github.com/OllisGit/OctoPrint-CostEstimation
-source: https://github.com/OllisGit/OctoPrint-CostEstimation
-archive: https://github.com/OllisGit/OctoPrint-CostEstimation/releases/latest/download/master.zip
+homepage: https://github.com/Hillshum/OctoPrint-CostEstimation
+source: https://github.com/Hillshum/OctoPrint-CostEstimation
+archive: https://github.com/Hillshum/OctoPrint-CostEstimation/releases/latest/download/master.zip
 compatibility:
   python: ">=2.7,<4"
   octoprint: