diff --git a/grc/es_arb.xml b/grc/es_arb.xml
index 32ddf47..2287324 100644
--- a/grc/es_arb.xml
+++ b/grc/es_arb.xml
@@ -2,7 +2,7 @@
 <block>
   <name>EventStream Arbiter</name>
   <key>variable_es_arb</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <var_make>self.$(id) = $(id) = es.es_make_arbiter()</var_make>
   <make></make>
diff --git a/grc/es_emit_event.xml b/grc/es_emit_event.xml
index 9a21ed3..7591da7 100644
--- a/grc/es_emit_event.xml
+++ b/grc/es_emit_event.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Hier Stream Event - Emitted Event</name>
   <key>es_hier_event_emit</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es;
 import pmt;</import>
   <make>self.$(id) = $(id) = $evtname</make>
diff --git a/grc/es_handler_file.xml b/grc/es_handler_file.xml
index 60fbbf5..47df966 100644
--- a/grc/es_handler_file.xml
+++ b/grc/es_handler_file.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Handler File</name>
   <key>es_handler_file</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.es_make_handler_file($dt, $path, $desc)</make>
   
diff --git a/grc/es_handler_passthrough.xml b/grc/es_handler_passthrough.xml
index 7dd3eb9..61f057d 100644
--- a/grc/es_handler_passthrough.xml
+++ b/grc/es_handler_passthrough.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Handler Passthrough</name>
   <key>es_handler_passthrough</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.es_make_handler_passthrough()</make>
   
diff --git a/grc/es_handler_pdu.xml b/grc/es_handler_pdu.xml
index 4436795..2a15be1 100644
--- a/grc/es_handler_pdu.xml
+++ b/grc/es_handler_pdu.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Handler to PDU</name>
   <key>es_handler_pdu</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.es_make_handler_pdu($dt)</make>
   
diff --git a/grc/es_handler_print.xml b/grc/es_handler_print.xml
index 72eea32..0c5c07b 100644
--- a/grc/es_handler_print.xml
+++ b/grc/es_handler_print.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Handler Print</name>
   <key>es_handler_print</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.es_make_handler_print($dt)</make>
   
diff --git a/grc/es_patterned_interleaver.xml b/grc/es_patterned_interleaver.xml
index 1b70aac..3a9f0f0 100644
--- a/grc/es_patterned_interleaver.xml
+++ b/grc/es_patterned_interleaver.xml
@@ -2,7 +2,7 @@
 <block>
   <name>patterned_interleaver</name>
   <key>es_patterned_interleaver</key>
-  <category>es</category>
+  <category>[EVENTSTREAM]/es</category>
   <import>import es</import>
   <make>es.patterned_interleaver(items, itemsize, pattern)</make>
   <!-- Make one 'param' node for every Parameter you want settable from the GUI.
diff --git a/grc/es_sink.xml b/grc/es_sink.xml
index 39477f3..8991b13 100644
--- a/grc/es_sink.xml
+++ b/grc/es_sink.xml
@@ -2,7 +2,7 @@
 <block>
     <name>EventStream Sink</name>
     <key>es_sink</key>
-    <category>EVENTSTREAM</category>
+    <category>[EVENTSTREAM]</category>
     <import>import es</import>
     <make>es.sink($num_streams*[$type.size],$nthreads,$samplehistory,$eb.raw,$ss.raw,$cb.raw)</make>
 
diff --git a/grc/es_source.xml b/grc/es_source.xml
index 04bf95c..e0bfa97 100644
--- a/grc/es_source.xml
+++ b/grc/es_source.xml
@@ -2,7 +2,7 @@
 <block>
   <name>EventStream Source</name>
   <key>es_source</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.source($num_streams*[$type.size], $nthreads, $eb.raw, $mm.raw)</make>
 
diff --git a/grc/es_trigger_edge_f.xml b/grc/es_trigger_edge_f.xml
index 36a6d64..3b3e3b5 100644
--- a/grc/es_trigger_edge_f.xml
+++ b/grc/es_trigger_edge_f.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Trigger Rising Edge Event</name>
   <key>es_trigger_edge_f</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.trigger_edge_f($thresh,$length,$lookback,$type.size,$guard)</make>
   
diff --git a/grc/es_trigger_sample_timer.xml b/grc/es_trigger_sample_timer.xml
index 70faec3..640b0db 100644
--- a/grc/es_trigger_sample_timer.xml
+++ b/grc/es_trigger_sample_timer.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Trigger Sample-Timer Event</name>
   <key>es_trigger_sample_timer</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>es.trigger_sample_timer($type.size, $period, $shift, $sched_dist, $length )</make>
   
diff --git a/grc/es_trigger_timer.xml b/grc/es_trigger_timer.xml
index e2a1fb2..3fcac75 100644
--- a/grc/es_trigger_timer.xml
+++ b/grc/es_trigger_timer.xml
@@ -2,7 +2,7 @@
 <block>
   <name>Trigger System-Timer Event</name>
   <key>es_timer_trigger</key>
-  <category>EVENTSTREAM</category>
+  <category>[EVENTSTREAM]</category>
   <import>import es</import>
   <make>#slurp
 es.es_trigger_timer("TIMER_EXPIRED_EVENT", $length, $delay, $iterations); </make>
diff --git a/grc/patterned_interleaver.xml b/grc/patterned_interleaver.xml
index fef48d7..d3801f3 100644
--- a/grc/patterned_interleaver.xml
+++ b/grc/patterned_interleaver.xml
@@ -2,7 +2,7 @@
 <block>
     <name>Patterned Interleaver</name>
     <key>patterned_interlaver</key>
-    <category>Stream Conversions</category>
+    <category>[EVENTSTREAM]/Stream Conversions</category>
     <import>import es, numpy</import>
     <make>es.patterned_interleaver($type.np, $ninputs, $pattern)</make>
 
diff --git a/grc/variable_es_evt.xml b/grc/variable_es_evt.xml
index e8762a1..83d7eed 100644
--- a/grc/variable_es_evt.xml
+++ b/grc/variable_es_evt.xml
@@ -7,7 +7,7 @@
 <block>
 	<name>Event-Time Parameter</name>
 	<key>variable_es_evt</key>
-    <category>EVENTSTREAM</category>
+    <category>[EVENTSTREAM]</category>
 	<var_make>self.$(id) = $(id) = $value</var_make>
 	<make></make>
 	<param>