diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 8071d0e8829..a2d8f97fbcf 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -483,7 +483,7 @@ dependencies = [
 [[package]]
 name = "energymon-default-sys"
 version = "0.1.0"
-source = "git+https://github.com/energymon/energymon-sys.git#92eaa056a7b7098ff8b0516da184bc94253de132"
+source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
 dependencies = [
  "energymon-sys 0.1.0 (git+https://github.com/energymon/energymon-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -493,7 +493,7 @@ dependencies = [
 [[package]]
 name = "energymon-sys"
 version = "0.1.0"
-source = "git+https://github.com/energymon/energymon-sys.git#92eaa056a7b7098ff8b0516da184bc94253de132"
+source = "git+https://github.com/energymon/energymon-sys.git#199cd11b36f14768a6a379843400c6a6671ffe5e"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -753,7 +753,7 @@ dependencies = [
 [[package]]
 name = "hbs-common-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -761,7 +761,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
 dependencies = [
  "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -770,7 +770,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 3d008ce8a9b..ba56ff4f03a 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -711,7 +711,7 @@ dependencies = [
 [[package]]
 name = "hbs-common-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -719,7 +719,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
 dependencies = [
  "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -728,7 +728,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 71e3966c3bd..c9a8717940b 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -679,7 +679,7 @@ dependencies = [
 [[package]]
 name = "hbs-common-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -687,7 +687,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#9a8ddd47601b6d63a2d5a1572fd6f9161b9e5dcf"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-rust.git#0f46659b465927a88b23b69b66602ded43dd37b7"
 dependencies = [
  "hbs-pow-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -696,7 +696,7 @@ dependencies = [
 [[package]]
 name = "hbs-pow-sys"
 version = "0.2.0"
-source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#ce38105aa4133688bd4cdbcef66683832929a33f"
+source = "git+https://github.com/libheartbeats/heartbeats-simple-sys.git#9ae3875aa26610d6155b5191f832e74410558a73"
 dependencies = [
  "hbs-common-sys 0.2.0 (git+https://github.com/libheartbeats/heartbeats-simple-sys.git)",
  "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/heartbeats/characterize.py b/tests/heartbeats/characterize.py
index 4a0f3213c2c..ab35b3d106c 100644
--- a/tests/heartbeats/characterize.py
+++ b/tests/heartbeats/characterize.py
@@ -18,10 +18,12 @@ GUARD_TIME = 10
 HEARTBEAT_DEFAULT_WINDOW_SIZE = 20
 # Use a larger window sizes to reduce or prevent writing log files until benchmark completion
 # (profiler name, window size)
+# These categories need to be kept aligned with ProfilerCategory in components/profile_traits/time.rs
 HEARTBEAT_PROFILER_CATEGORIES = [
     ("Compositing", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutPerform", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutStyleRecalc", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("LayoutTextShaping", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutRestyleDamagePropagation", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutNonIncrementalReset", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutSelectorMatch", HEARTBEAT_DEFAULT_WINDOW_SIZE),
@@ -30,7 +32,6 @@ HEARTBEAT_PROFILER_CATEGORIES = [
     ("LayoutGeneratedContent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutMain", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutParallelWarmup", HEARTBEAT_DEFAULT_WINDOW_SIZE),
-    ("LayoutShaping", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("LayoutDispListBuild", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("PaintingPerTile", 50),
     ("PaintingPrepBuff", HEARTBEAT_DEFAULT_WINDOW_SIZE),
@@ -41,18 +42,19 @@ HEARTBEAT_PROFILER_CATEGORIES = [
     ("ScriptDevtoolsMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptDocumentEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptDomEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptFileRead", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptImageCacheMsg", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptInputEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptNetworkEvent", 200),
     ("ScriptResize", HEARTBEAT_DEFAULT_WINDOW_SIZE),
-    ("ScriptEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
-    ("ScriptUpdateReplacedElement", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptSetViewport", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptTimerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptStylesheetLoad", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptUpdateReplacedElement", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptWebSocketEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
-    ("ScriptXhrEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
-    ("ApplicationHeartbeat", 100)
+    ("ApplicationHeartbeat", 100),
 ]
 ENERGY_READER_BIN = "energymon"
 ENERGY_READER_TEMP_OUTPUT = "energymon.txt"