diff --git a/content/advanced-go-concurrency-patterns.article b/content/advanced-go-concurrency-patterns.article
index 4d4fcd0..c18636b 100644
--- a/content/advanced-go-concurrency-patterns.article
+++ b/content/advanced-go-concurrency-patterns.article
@@ -1,5 +1,6 @@
 Advanced Go Concurrency Patterns
 23 May 2013
+Tags: talk, video, concurrency
 
 Andrew Gerrand
 
diff --git a/content/building-stathat-with-go.article b/content/building-stathat-with-go.article
index 9f47ae0..fe273cd 100644
--- a/content/building-stathat-with-go.article
+++ b/content/building-stathat-with-go.article
@@ -1,6 +1,6 @@
 Building StatHat with Go
 19 Dec 2011
-Tags: guest, rpc
+Tags: guest
 
 Patrick Crosby
 
diff --git a/content/c-go-cgo.article b/content/c-go-cgo.article
index 7f2b976..287d933 100644
--- a/content/c-go-cgo.article
+++ b/content/c-go-cgo.article
@@ -1,6 +1,6 @@
 C? Go? Cgo!
 17 Mar 2011
-Tags: cgo
+Tags: cgo, technical
 
 Andrew Gerrand
 
diff --git a/content/debugging-go-programs-with-gnu-debugger.article b/content/debugging-go-programs-with-gnu-debugger.article
index 0a9a069..1ff9b27 100644
--- a/content/debugging-go-programs-with-gnu-debugger.article
+++ b/content/debugging-go-programs-with-gnu-debugger.article
@@ -1,6 +1,6 @@
 Debugging Go programs with the GNU Debugger
 30 Oct 2011
-Tags: debug, gdb
+Tags: debug, gdb, technical
 
 Andrew Gerrand
 
diff --git a/content/defer-panic-and-recover.article b/content/defer-panic-and-recover.article
index 00f0327..8e10c90 100644
--- a/content/defer-panic-and-recover.article
+++ b/content/defer-panic-and-recover.article
@@ -1,6 +1,6 @@
 Defer, Panic, and Recover
 4 Aug 2010
-Tags: closure, defer, panic, recover
+Tags: defer, panic, recover, technical, function
 
 Andrew Gerrand
 
diff --git a/content/error-handling-and-go.article b/content/error-handling-and-go.article
index 65b2830..266458f 100644
--- a/content/error-handling-and-go.article
+++ b/content/error-handling-and-go.article
@@ -1,6 +1,6 @@
 Error handling and Go
 12 Jul 2011
-Tags: error, interface, type
+Tags: error, interface, type, technical
 
 Andrew Gerrand
 
diff --git a/content/first-class-functions-in-go-and-new-go.article b/content/first-class-functions-in-go-and-new-go.article
index b3b3852..ea3aa87 100644
--- a/content/first-class-functions-in-go-and-new-go.article
+++ b/content/first-class-functions-in-go-and-new-go.article
@@ -1,6 +1,6 @@
 "First Class Functions in Go" and new Go course notes
 30 Jun 2011
-Tags: codewalk, function
+Tags: codewalk, function, technical
 
 Andrew Gerrand
 
diff --git a/content/gccgo-in-gcc-471.article b/content/gccgo-in-gcc-471.article
index f47aea2..2e71832 100644
--- a/content/gccgo-in-gcc-471.article
+++ b/content/gccgo-in-gcc-471.article
@@ -1,5 +1,6 @@
 Gccgo in GCC 4.7.1
 11 Jul 2012
+Tags: release
 
 Ian Lance Taylor
 
diff --git a/content/getthee-to-go-meetup.article b/content/getthee-to-go-meetup.article
index 4435cbd..c196c88 100644
--- a/content/getthee-to-go-meetup.article
+++ b/content/getthee-to-go-meetup.article
@@ -1,5 +1,6 @@
 Get thee to a Go meetup
 27 Feb 2013
+Tags: community, talk
 
 Andrew Gerrand
 
diff --git a/content/getting-to-know-go-community.article b/content/getting-to-know-go-community.article
index c55c8fd..9b51ab3 100644
--- a/content/getting-to-know-go-community.article
+++ b/content/getting-to-know-go-community.article
@@ -1,5 +1,6 @@
 Getting to know the Go community
 21 Dec 2011
+Tags: community
 
 Andrew Gerrand
 
diff --git a/content/gif-decoder-exercise-in-go-interfaces.article b/content/gif-decoder-exercise-in-go-interfaces.article
index 367c5c1..3496ea6 100644
--- a/content/gif-decoder-exercise-in-go-interfaces.article
+++ b/content/gif-decoder-exercise-in-go-interfaces.article
@@ -1,6 +1,6 @@
 A GIF decoder: an exercise in Go interfaces
 25 May 2011
-Tags: gif, gopher, image, interface, lagomorph, lzw, moustache, rodent
+Tags: gif, gopher, image, interface, lagomorph, lzw, moustache, rodent, technical
 
 Rob Pike
 
diff --git a/content/go-11-is-released.article b/content/go-11-is-released.article
index 6f73fa7..1245c30 100644
--- a/content/go-11-is-released.article
+++ b/content/go-11-is-released.article
@@ -1,5 +1,6 @@
 Go 1.1 is released
 13 May 2013
+Tags: release
 
 Andrew Gerrand
 
diff --git a/content/go-and-google-app-engine.article b/content/go-and-google-app-engine.article
index 9f51540..e12feb4 100644
--- a/content/go-and-google-app-engine.article
+++ b/content/go-and-google-app-engine.article
@@ -1,6 +1,6 @@
 Go and Google App Engine
 10 May 2011
-Tags: appengine
+Tags: appengine, release
 
 David Symonds
 
diff --git a/content/go-at-heroku.article b/content/go-at-heroku.article
index 5e227ce..8f0892d 100644
--- a/content/go-at-heroku.article
+++ b/content/go-at-heroku.article
@@ -1,6 +1,6 @@
 Go at Heroku
 21 Apr 2011
-Tags: concurrency, gofmt, guest, heroku, websocket
+Tags: guest
 
 Keith Rarick
 
diff --git a/content/go-at-io-frequently-asked-questions.article b/content/go-at-io-frequently-asked-questions.article
index 5a2b7f7..fb36f84 100644
--- a/content/go-at-io-frequently-asked-questions.article
+++ b/content/go-at-io-frequently-asked-questions.article
@@ -1,5 +1,6 @@
 Go at I/O: Frequently Asked Questions
 27 May 2010
+Tags: appengine
 
 Andrew Gerrand
 
diff --git a/content/go-concurrency-patterns-timing-out-and.article b/content/go-concurrency-patterns-timing-out-and.article
index 16949fe..9d60ead 100644
--- a/content/go-concurrency-patterns-timing-out-and.article
+++ b/content/go-concurrency-patterns-timing-out-and.article
@@ -1,6 +1,6 @@
 Go Concurrency Patterns: Timing out, moving on
 23 Sep 2010
-Tags: channel, concurrency, goroutine
+Tags: concurrency, technical
 
 Andrew Gerrand
 
diff --git a/content/go-fmt-your-code.article b/content/go-fmt-your-code.article
index b5def3a..c98bd3f 100644
--- a/content/go-fmt-your-code.article
+++ b/content/go-fmt-your-code.article
@@ -1,6 +1,6 @@
 go fmt your code
 23 Jan 2013
-Tags: gofix, gofmt
+Tags: gofix, gofmt, technical
 
 Andrew Gerrand
 
diff --git a/content/go-image-package.article b/content/go-image-package.article
index c10875e..5c20d68 100644
--- a/content/go-image-package.article
+++ b/content/go-image-package.article
@@ -1,6 +1,6 @@
 The Go image package
 21 Sep 2011
-Tags: image, libraries
+Tags: image, libraries, technical
 
 Nigel Tao
 
diff --git a/content/go-imagedraw-package.article b/content/go-imagedraw-package.article
index e89ec6e..0c98560 100644
--- a/content/go-imagedraw-package.article
+++ b/content/go-imagedraw-package.article
@@ -1,6 +1,6 @@
 The Go image/draw package
 29 Sep 2011
-Tags: draw, image, libraries
+Tags: draw, image, libraries, technical
 
 Nigel Tao
 
diff --git a/content/go-maps-in-action.article b/content/go-maps-in-action.article
index f6d59a7..80c1477 100644
--- a/content/go-maps-in-action.article
+++ b/content/go-maps-in-action.article
@@ -1,5 +1,6 @@
 Go maps in action
 6 Feb 2013
+Tags: map, technical
 
 Andrew Gerrand
 
diff --git a/content/go-one-year-ago-today.article b/content/go-one-year-ago-today.article
index d29d3d3..f471c54 100644
--- a/content/go-one-year-ago-today.article
+++ b/content/go-one-year-ago-today.article
@@ -1,6 +1,6 @@
 Go: one year ago today
 10 Nov 2010
-Tags: release
+Tags: birthday
 
 Andrew Gerrand
 
diff --git a/content/go-programming-session-video-from.article b/content/go-programming-session-video-from.article
index deaea6c..0d44f9e 100644
--- a/content/go-programming-session-video-from.article
+++ b/content/go-programming-session-video-from.article
@@ -1,6 +1,6 @@
 Go Programming session video from Google I/O
 6 Jun 2010
-Tags: video
+Tags: video, talk
 
 Andrew Gerrand
 
diff --git a/content/go-slices-usage-and-internals.article b/content/go-slices-usage-and-internals.article
index d04cdcb..3561220 100644
--- a/content/go-slices-usage-and-internals.article
+++ b/content/go-slices-usage-and-internals.article
@@ -1,6 +1,6 @@
 Go Slices: usage and internals
 5 Jan 2011
-Tags: slice
+Tags: slice, technical
 
 Andrew Gerrand
 
diff --git a/content/go-turns-three.article b/content/go-turns-three.article
index 97fd3a6..d8b17e6 100644
--- a/content/go-turns-three.article
+++ b/content/go-turns-three.article
@@ -1,6 +1,6 @@
 Go turns three
 10 Nov 2012
-Tags: community
+Tags: community, birthday
 
 Russ Cox
 
diff --git a/content/go-version-1-is-released.article b/content/go-version-1-is-released.article
index c30ee42..acf6a31 100644
--- a/content/go-version-1-is-released.article
+++ b/content/go-version-1-is-released.article
@@ -1,5 +1,6 @@
 Go version 1 is released
 28 Mar 2012
+Tags: release, go1
 
 Andrew Gerrand
 
diff --git a/content/go-videos-from-google-io-2012.article b/content/go-videos-from-google-io-2012.article
index 08195e6..d24b868 100644
--- a/content/go-videos-from-google-io-2012.article
+++ b/content/go-videos-from-google-io-2012.article
@@ -1,5 +1,6 @@
 Go videos from Google I/O 2012
 2 Jul 2012
+Tags: talk, video, concurrency, appengine, ethos
 
 Andrew Gerrand
 
diff --git a/content/gobs-of-data.article b/content/gobs-of-data.article
index 2f64ecc..5f6bb4b 100644
--- a/content/gobs-of-data.article
+++ b/content/gobs-of-data.article
@@ -1,6 +1,6 @@
 Gobs of data
 24 Mar 2011
-Tags: gob, json, protobuf, xml
+Tags: gob, json, protobuf, xml, technical
 
 Rob Pike
 
diff --git a/content/godoc-documenting-go-code.article b/content/godoc-documenting-go-code.article
index 602df0e..da8ee85 100644
--- a/content/godoc-documenting-go-code.article
+++ b/content/godoc-documenting-go-code.article
@@ -1,6 +1,6 @@
 Godoc: documenting Go code
 31 Mar 2011
-Tags: godoc
+Tags: godoc, technical
 
 Andrew Gerrand
 
diff --git a/content/gos-declaration-syntax.article b/content/gos-declaration-syntax.article
index e122550..6ef8580 100644
--- a/content/gos-declaration-syntax.article
+++ b/content/gos-declaration-syntax.article
@@ -1,6 +1,6 @@
 Go's Declaration Syntax
 7 Jul 2010
-Tags: c, syntax
+Tags: c, syntax, ethos
 
 Rob Pike
 
diff --git a/content/introducing-go-playground.article b/content/introducing-go-playground.article
index 1229dd7..cee1484 100644
--- a/content/introducing-go-playground.article
+++ b/content/introducing-go-playground.article
@@ -1,6 +1,6 @@
 Introducing the Go Playground
 15 Sep 2010
-Tags: release
+Tags: playground
 
 Andrew Gerrand
 
diff --git a/content/introducing-gofix.article b/content/introducing-gofix.article
index 61655e8..3860450 100644
--- a/content/introducing-gofix.article
+++ b/content/introducing-gofix.article
@@ -1,6 +1,6 @@
 Introducing Gofix
 15 Apr 2011
-Tags: gofix
+Tags: gofix, technical
 
 Russ Cox
 
diff --git a/content/json-and-go.article b/content/json-and-go.article
index 95730a8..4a1ae36 100644
--- a/content/json-and-go.article
+++ b/content/json-and-go.article
@@ -1,6 +1,6 @@
 JSON and Go
 25 Jan 2011
-Tags: json
+Tags: json, technical
 
 Andrew Gerrand
 
diff --git a/content/json-rpc-tale-of-interfaces.article b/content/json-rpc-tale-of-interfaces.article
index 435295d..286ad11 100644
--- a/content/json-rpc-tale-of-interfaces.article
+++ b/content/json-rpc-tale-of-interfaces.article
@@ -1,6 +1,6 @@
 JSON-RPC: a tale of interfaces
 27 Apr 2010
-Tags: json, rpc
+Tags: json, rpc, technical
 
 Andrew Gerrand
 
diff --git a/content/laws-of-reflection.article b/content/laws-of-reflection.article
index 05d29b6..18c537e 100644
--- a/content/laws-of-reflection.article
+++ b/content/laws-of-reflection.article
@@ -1,6 +1,6 @@
 The Laws of Reflection
 6 Sep 2011
-Tags: interface, reflect, type
+Tags: interface, reflect, type, technical
 
 Rob Pike
 
diff --git a/content/learn-go-from-your-browser.article b/content/learn-go-from-your-browser.article
index 98ddd24..e068eb5 100644
--- a/content/learn-go-from-your-browser.article
+++ b/content/learn-go-from-your-browser.article
@@ -1,6 +1,6 @@
 Learn Go from your browser
 4 Oct 2011
-Tags: learn, playground, tour
+Tags: playground, tour
 
 Andrew Gerrand
 
diff --git a/content/organizing-go-code.article b/content/organizing-go-code.article
index abfb807..9eed04d 100644
--- a/content/organizing-go-code.article
+++ b/content/organizing-go-code.article
@@ -1,6 +1,6 @@
 Organizing Go code
 16 Aug 2012
-Tags: godoc, gopath, interface, libraries
+Tags: godoc, gopath, interface, libraries, tools, technical
 
 Andrew Gerrand
 
diff --git a/content/preview-of-go-version-1.article b/content/preview-of-go-version-1.article
index 7d4328a..bb7d26f 100644
--- a/content/preview-of-go-version-1.article
+++ b/content/preview-of-go-version-1.article
@@ -1,6 +1,6 @@
 A preview of Go version 1
 5 Oct 2011
-Tags: v1
+Tags: go1, release
 
 Russ Cox
 
diff --git a/content/profiling-go-programs.article b/content/profiling-go-programs.article
index 9422774..fb5020f 100644
--- a/content/profiling-go-programs.article
+++ b/content/profiling-go-programs.article
@@ -1,6 +1,6 @@
 Profiling Go Programs
 24 Jun 2011
-Tags: benchmark, optimization, pprof, profiling
+Tags: benchmark, pprof, profiling, technical
 
 Russ Cox, July 2011; updated by Shenghou Ma, May 2013
 
diff --git a/content/real-go-projects-smarttwitter-and-webgo.article b/content/real-go-projects-smarttwitter-and-webgo.article
index 5fd46df..1bb9726 100644
--- a/content/real-go-projects-smarttwitter-and-webgo.article
+++ b/content/real-go-projects-smarttwitter-and-webgo.article
@@ -1,6 +1,6 @@
 Real Go Projects: SmartTwitter and web.go
 19 Oct 2010
-Tags: concurrency, guest, json
+Tags: guest
 
 Michael Hoisie
 
diff --git a/content/share-memory-by-communicating.article b/content/share-memory-by-communicating.article
index fdbc0b5..144e6c3 100644
--- a/content/share-memory-by-communicating.article
+++ b/content/share-memory-by-communicating.article
@@ -1,6 +1,6 @@
 Share Memory By Communicating
 13 Jul 2010
-Tags: channel, concurrency, goroutine
+Tags: concurrency, technical
 
 Andrew Gerrand
 
diff --git a/content/the-app-engine-sdk-and-workspaces-gopath.article b/content/the-app-engine-sdk-and-workspaces-gopath.article
index be40a2a..873883a 100644
--- a/content/the-app-engine-sdk-and-workspaces-gopath.article
+++ b/content/the-app-engine-sdk-and-workspaces-gopath.article
@@ -1,6 +1,6 @@
 The App Engine SDK and workspaces (GOPATH)
 9 Jan 2013
-Tags: appengine, build, gopath
+Tags: appengine, tools, gopath
 
 Andrew Gerrand
 
diff --git a/content/the-path-to-go-1.article b/content/the-path-to-go-1.article
index 1c8b78e..a2879f5 100644
--- a/content/the-path-to-go-1.article
+++ b/content/the-path-to-go-1.article
@@ -1,5 +1,6 @@
 The path to Go 1
 14 Mar 2013
+Tags: talk, video, go1
 
 Andrew Gerrand
 
diff --git a/content/third-party-libraries-goprotobuf-and.article b/content/third-party-libraries-goprotobuf-and.article
index 119e531..70791b8 100644
--- a/content/third-party-libraries-goprotobuf-and.article
+++ b/content/third-party-libraries-goprotobuf-and.article
@@ -1,6 +1,6 @@
 Third-party libraries: goprotobuf and beyond
 20 Apr 2010
-Tags: protobuf
+Tags: protobuf, community
 
 Andrew Gerrand
 
diff --git a/content/two-recent-go-articles.article b/content/two-recent-go-articles.article
index ef6fb90..63aeb01 100644
--- a/content/two-recent-go-articles.article
+++ b/content/two-recent-go-articles.article
@@ -1,5 +1,6 @@
 Two recent Go articles
 6 Mar 2013
+Tags: google, talk, ethos
 
 Andrew Gerrand
 
diff --git a/content/two-recent-go-talks.article b/content/two-recent-go-talks.article
index 8feccf3..edcb868 100644
--- a/content/two-recent-go-talks.article
+++ b/content/two-recent-go-talks.article
@@ -1,6 +1,6 @@
 Two recent Go talks
 2 Jan 2013
-Tags: talk, video
+Tags: talk, video, ethos
 
 Andrew Gerrand