diff --git a/apps/gdb/gdb_active.talon b/apps/gdb/gdb_active.talon
index 12c6ce246c..d18bc447d6 100644
--- a/apps/gdb/gdb_active.talon
+++ b/apps/gdb/gdb_active.talon
@@ -2,10 +2,10 @@ os: linux
 # XXX - this matches .gdb files atm
 #win.title: /gdb/
 tag: terminal
-tag: user.gdb
+and tag: user.gdb
 -
 tag(): user.debugger
-until <number>: "until {number}"
+until <number>:             "until {number}"
 force clear all break points:
     insert("d br\n")
     insert("y\n")
@@ -15,24 +15,24 @@ break [on] clipboard:
     key(enter)
 
 # information
-list [source]: "list\n"
-info source: "info source\n"
+list [source]:              "list\n"
+info source:                "info source\n"
 
-print: "p "
+print:                      "p "
 print [variable] <user.text>: "p {text}"
-print hex: "p/x "
+print hex:                  "p/x "
 print hex [variable] <user.text>: "p/x {text}"
-print string: "p/s "
+print string:               "p/s "
 
 # hexdumping
 # XXX - switch the sizes to a list in python?
 # XXX - should cache the last used size
-hex dump <number> bytes: "x/{number}bx "
+hex dump <number> bytes:    "x/{number}bx "
 hex dump <number> (half | short) words: "x/{number}hx "
 hex dump <number> (d | long) words: "x/{number}dx "
 hex dump <number> quad words: "x/{number}gx "
 # this is some arbitrary default for convenience
-hex dump: "x/100gx "
+hex dump:                   "x/100gx "
 hex dump highlighted:
     insert("x/100gx ")
     edit.copy()
@@ -44,16 +44,16 @@ hex dump clipboard:
     key(enter)
 
 # execution
-source: "source \t\t"
+source:                     "source \t\t"
 
 # displays
 # XXX - move thee invoke command into a python script
 (list | show | info) display: "info display\n"
-display assembly line$: "display /i $pc\n"
-display source: "display "
+display assembly line$:     "display /i $pc\n"
+display source:             "display "
 enable display <number_small>: "enable display {number_small}\n"
 disable display <number_small>: "disable display {number_small}\n"
-undisplay: "undisplay\n"
+undisplay:                  "undisplay\n"
 
 # variables
 (list | show | info) local: "info local "
@@ -64,17 +64,17 @@ undisplay: "undisplay\n"
 (list | show | info) variables: "info variables\n"
 
 # threads
-info threads: "info threads\n"
+info threads:               "info threads\n"
 
-restart [program]: "r\n"
-continue: "c\n"
-back trace: "bt\n"
-debug quit: "quit\n"
+restart [program]:          "r\n"
+continue:                   "c\n"
+back trace:                 "bt\n"
+debug quit:                 "quit\n"
 # more quickly quit when there are inferiors
-debug force quit: "quit\ny\n"
+debug force quit:           "quit\ny\n"
 (show | info) (inf | inferiors): "info inferiors\n"
-inferior <number_small>$: "inferior {number_small}\n"
-inferior: "inferior "
+inferior <number_small>$:   "inferior {number_small}\n"
+inferior:                   "inferior "
 resume main (inf | inferior):
     insert("inferior 1\n")
     insert("c\n")
@@ -83,20 +83,20 @@ resume [from] (inf | inferior) <number_small>$:
     insert("c\n")
 
 # arguments
-set args: "set args "
+set args:                   "set args "
 
 # settings
 show follow (fork | forks) [mode]: "show follow-fork-mode\n"
 [set] follow (fork | forks) [mode] child: "set follow-fork-mode child\n"
 [set] follow (fork | forks) [mode] parent: "set follow-fork-mode parent\n"
 
-show detach on fork: "show detach-on-fork\n"
-set detach on fork: "set detach-on-fork on\n"
-unset detach on fork: "set detach-on-fork off\n"
+show detach on fork:        "show detach-on-fork\n"
+set detach on fork:         "set detach-on-fork on\n"
+unset detach on fork:       "set detach-on-fork off\n"
 
 # list
-show list size: "show listsize\n"
+show list size:             "show listsize\n"
 set list size <number_small>: "set listsize {number_small}\n"
 
 # misc
-clear screen: "shell clear\n"
+clear screen:               "shell clear\n"