diff --git a/contrib/banner.svg b/contrib/banner.svg
index af82021bb2..74881803e2 100644
--- a/contrib/banner.svg
+++ b/contrib/banner.svg
@@ -319,7 +319,7 @@
             <dc:title>steckdenis</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description>Logo for I3, an improved dynamic tiling window manager: http://i3.zekjur.net/</dc:description>
+        <dc:description>Logo for i3 - an improved tiling window manager: http://i3.zekjur.net/</dc:description>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
diff --git a/contrib/sticker_stickma_black.svg b/contrib/sticker_stickma_black.svg
index fced8dd9a6..18c3299af7 100644
--- a/contrib/sticker_stickma_black.svg
+++ b/contrib/sticker_stickma_black.svg
@@ -329,7 +329,7 @@
             <dc:title>steckdenis</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description>Logo for I3, an improved dynamic tiling window manager: http://i3.zekjur.net/</dc:description>
+        <dc:description>Logo for i3 - an improved tiling window manager: http://i3.zekjur.net/</dc:description>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
diff --git a/debian/control b/debian/control
index 6ddc64e603..67e38ff968 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Provides: x-window-manager
 Recommends: xfonts-base, fonts-dejavu-core, libanyevent-i3-perl (>= 0.12), libjson-xs-perl, rxvt-unicode | x-terminal-emulator
-Description: improved dynamic tiling window manager
+Description: improved tiling window manager
  Key features of i3 are good documentation, reasonable defaults (changeable in
  a simple configuration file) and good multi-monitor support. The user
  interface is designed for power users and emphasizes keyboard usage. i3 uses
diff --git a/docs/NoName-2009-03-12/i3.tex b/docs/NoName-2009-03-12/i3.tex
index 4ca05f2414..5cc92311a4 100644
--- a/docs/NoName-2009-03-12/i3.tex
+++ b/docs/NoName-2009-03-12/i3.tex
@@ -29,7 +29,7 @@
 		add_ignore_event, xcb_intern_atom, xcb_intern_atom_reply, fprintf, printf, free, load_configuration,%
 		XInternAtom, exit, strlen}}
 }{}
-\title{i3 - an improved dynamic tiling window manager}
+\title{i3 - an improved tiling window manager}
 \author{sECuRE beim NoName e.V.\\
 ~\\
 powered by \LaTeX, of course}
diff --git a/generate-command-parser.pl b/generate-command-parser.pl
index 17728736d4..e8c240c2e6 100755
--- a/generate-command-parser.pl
+++ b/generate-command-parser.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 # vim:ts=4:sw=4:expandtab
 #
-# i3 - an improved dynamic tiling window manager
+# i3 - an improved tiling window manager
 # © 2009 Michael Stapelberg and contributors (see also: LICENSE)
 #
 # generate-command-parser.pl: script to generate parts of the command parser
diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c
index 780aa62d1a..96baff00fb 100644
--- a/i3-config-wizard/main.c
+++ b/i3-config-wizard/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-config-wizard: Program to convert configs using keycodes to configs using
diff --git a/i3-dump-log/main.c b/i3-dump-log/main.c
index 9b40a63077..c62df4387e 100644
--- a/i3-dump-log/main.c
+++ b/i3-dump-log/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-dump-log/main.c: Dumps the i3 SHM log to stdout.
diff --git a/i3-input/main.c b/i3-input/main.c
index 21d447eb34..ded5a153d1 100644
--- a/i3-input/main.c
+++ b/i3-input/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-input/main.c: Utility which lets the user input commands and sends them
diff --git a/i3-msg/main.c b/i3-msg/main.c
index 379547391c..38f7e02263 100644
--- a/i3-msg/main.c
+++ b/i3-msg/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-msg/main.c: Utility which sends messages to a running i3-instance using
diff --git a/i3-nagbar/main.c b/i3-nagbar/main.c
index dc8e27dd71..5a03fa6266 100644
--- a/i3-nagbar/main.c
+++ b/i3-nagbar/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3-nagbar is a utility which displays a nag message, for example in the case
diff --git a/i3bar/include/util.h b/i3bar/include/util.h
index 1f56361106..bb135c9ef2 100644
--- a/i3bar/include/util.h
+++ b/i3bar/include/util.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/include/all.h b/include/all.h
index 0d4dbc4ed6..540a7b4bb3 100644
--- a/include/all.h
+++ b/include/all.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This header file includes all relevant files of i3 and the most often used
diff --git a/include/assignments.h b/include/assignments.h
index a4dc766b5e..67b5d16f6e 100644
--- a/include/assignments.h
+++ b/include/assignments.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * assignments.c: Assignments for specific windows (for_window).
diff --git a/include/bindings.h b/include/bindings.h
index df3c32a5a8..b78a00fc68 100644
--- a/include/bindings.h
+++ b/include/bindings.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * bindings.h: Functions for configuring, finding, and running bindings.
diff --git a/include/click.h b/include/click.h
index 898f187068..7380c4f5eb 100644
--- a/include/click.h
+++ b/include/click.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * click.c: Button press (mouse click) events.
diff --git a/include/commands.h b/include/commands.h
index 17d0668167..54e3c352b7 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * commands.c: all command functions (see commands_parser.c)
diff --git a/include/commands_parser.h b/include/commands_parser.h
index 7e1c520349..3ca2107505 100644
--- a/include/commands_parser.h
+++ b/include/commands_parser.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * commands.c: all command functions (see commands_parser.c)
diff --git a/include/con.h b/include/con.h
index 52f588b8bc..6310713708 100644
--- a/include/con.h
+++ b/include/con.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * con.c: Functions which deal with containers directly (creating containers,
diff --git a/include/config_directives.h b/include/config_directives.h
index 07bd29d2a2..0141b8336b 100644
--- a/include/config_directives.h
+++ b/include/config_directives.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_directives.h: all config storing functions (see config_parser.c)
diff --git a/include/config_parser.h b/include/config_parser.h
index 636fc368aa..0330c89fa2 100644
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_parser.h: config parser-related definitions
diff --git a/include/configuration.h b/include/configuration.h
index 523672eb64..c062ae4c48 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * include/configuration.h: Contains all structs/variables for the configurable
diff --git a/include/data.h b/include/data.h
index 5eade9d11e..f448d263c5 100644
--- a/include/data.h
+++ b/include/data.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * include/data.h: This file defines all data structures used by i3
diff --git a/include/display_version.h b/include/display_version.h
index 6996038ecf..9dba20ec44 100644
--- a/include/display_version.h
+++ b/include/display_version.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * display_version.c: displays the running i3 version, runs as part of
diff --git a/include/drag.h b/include/drag.h
index 2027f93494..93a7c4f030 100644
--- a/include/drag.h
+++ b/include/drag.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * drag.c: click and drag.
diff --git a/include/ewmh.h b/include/ewmh.h
index f616eb840a..a4250e72c6 100644
--- a/include/ewmh.h
+++ b/include/ewmh.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * ewmh.c: Get/set certain EWMH properties easily.
diff --git a/include/fake_outputs.h b/include/fake_outputs.h
index 27a0d41a15..25e42fc730 100644
--- a/include/fake_outputs.h
+++ b/include/fake_outputs.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * Faking outputs is useful in pathological situations (like network X servers
diff --git a/include/floating.h b/include/floating.h
index 612874fcf1..781bb130b7 100644
--- a/include/floating.h
+++ b/include/floating.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * floating.c: Floating windows.
diff --git a/include/gaps.h b/include/gaps.h
index cb4d0093c1..50bff3da48 100644
--- a/include/gaps.h
+++ b/include/gaps.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/include/handlers.h b/include/handlers.h
index 81012e7bec..18416935af 100644
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * handlers.c: Small handlers for various events (keypresses, focus changes,
diff --git a/include/i3.h b/include/i3.h
index 4e2eb5c037..881efb6e78 100644
--- a/include/i3.h
+++ b/include/i3.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * i3.h: global variables that are used all over i3.
diff --git a/include/i3/ipc.h b/include/i3/ipc.h
index 187640cdcc..50fd155c9e 100644
--- a/include/i3/ipc.h
+++ b/include/i3/ipc.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This public header defines the different constants and message types to use
diff --git a/include/ipc.h b/include/ipc.h
index e85e6081bf..de5a694513 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * ipc.c: UNIX domain socket IPC (initialization, client handling, protocol).
diff --git a/include/key_press.h b/include/key_press.h
index 8f23854b0b..a3bd894337 100644
--- a/include/key_press.h
+++ b/include/key_press.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * key_press.c: key press handler
diff --git a/include/libi3.h b/include/libi3.h
index 549c8e563c..a07637b4f1 100644
--- a/include/libi3.h
+++ b/include/libi3.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * libi3: contains functions which are used by i3 *and* accompanying tools such
diff --git a/include/load_layout.h b/include/load_layout.h
index 9205800f6f..fc2d7a2de3 100644
--- a/include/load_layout.h
+++ b/include/load_layout.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * load_layout.c: Restore (parts of) the layout, for example after an inplace
diff --git a/include/log.h b/include/log.h
index 3a52c64d84..6830584c92 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * log.c: Logging functions.
diff --git a/include/main.h b/include/main.h
index 1f213ccee6..e65c2c395e 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * main.c: Initialization, main loop
diff --git a/include/manage.h b/include/manage.h
index 22fbe5277b..547914a894 100644
--- a/include/manage.h
+++ b/include/manage.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * manage.c: Initially managing new windows (or existing ones on restart).
diff --git a/include/match.h b/include/match.h
index 043c3a8f11..5584dd11b9 100644
--- a/include/match.h
+++ b/include/match.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * A "match" is a data structure which acts like a mask or expression to match
diff --git a/include/move.h b/include/move.h
index 830488b033..1002ba499e 100644
--- a/include/move.h
+++ b/include/move.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * move.c: Moving containers into some direction.
diff --git a/include/output.h b/include/output.h
index 4b4a501c09..06331afc0d 100644
--- a/include/output.h
+++ b/include/output.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * output.c: Output (monitor) related functions.
diff --git a/include/randr.h b/include/randr.h
index 6fd7ea9945..714290355f 100644
--- a/include/randr.h
+++ b/include/randr.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * For more information on RandR, please see the X.org RandR specification at
diff --git a/include/regex.h b/include/regex.h
index abda3cd7f4..388f3f7a58 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * regex.c: Interface to libPCRE (perl compatible regular expressions).
diff --git a/include/render.h b/include/render.h
index 03751c01d2..8d61f01c77 100644
--- a/include/render.h
+++ b/include/render.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * render.c: Renders (determines position/sizes) the layout tree, updating the
diff --git a/include/resize.h b/include/resize.h
index 5439fab546..972f9f1d27 100644
--- a/include/resize.h
+++ b/include/resize.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * resize.c: Interactive resizing.
diff --git a/include/restore_layout.h b/include/restore_layout.h
index 98b257d90f..ae0fc9daa3 100644
--- a/include/restore_layout.h
+++ b/include/restore_layout.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * restore_layout.c: Everything for restored containers that is not pure state
diff --git a/include/scratchpad.h b/include/scratchpad.h
index b24ffc080e..4310d8fed0 100644
--- a/include/scratchpad.h
+++ b/include/scratchpad.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * scratchpad.c: Scratchpad functions (TODO: more description)
diff --git a/include/shmlog.h b/include/shmlog.h
index a30852e764..1a4212a64b 100644
--- a/include/shmlog.h
+++ b/include/shmlog.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * The format of the shmlog data structure which i3 development versions use by
diff --git a/include/sighandler.h b/include/sighandler.h
index 2cc20cd214..cef74bcead 100644
--- a/include/sighandler.h
+++ b/include/sighandler.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/include/startup.h b/include/startup.h
index 0001a77dfc..55c777890d 100644
--- a/include/startup.h
+++ b/include/startup.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * startup.c: Startup notification code. Ensures a startup notification context
diff --git a/include/sync.h b/include/sync.h
index e726f99ef0..b211ff29df 100644
--- a/include/sync.h
+++ b/include/sync.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * sync.c: i3 sync protocol: https://i3wm.org/docs/testsuite.html#i3_sync
diff --git a/include/tiling_drag.h b/include/tiling_drag.h
index 3091b734e1..ac641c2ac5 100644
--- a/include/tiling_drag.h
+++ b/include/tiling_drag.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * tiling_drag.h: Reposition tiled windows by dragging.
diff --git a/include/tree.h b/include/tree.h
index 0b758d53eb..e0f8d86771 100644
--- a/include/tree.h
+++ b/include/tree.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * tree.c: Everything that primarily modifies the layout tree data structure.
diff --git a/include/util.h b/include/util.h
index 8525b6d9a9..925b47ae62 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * util.c: Utility functions, which can be useful everywhere within i3 (see
diff --git a/include/window.h b/include/window.h
index 7b43ab1fe7..49ef13ceab 100644
--- a/include/window.h
+++ b/include/window.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * window.c: Updates window attributes (X11 hints/properties).
diff --git a/include/workspace.h b/include/workspace.h
index fe6d9f88ea..0b8304cff1 100644
--- a/include/workspace.h
+++ b/include/workspace.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * workspace.c: Modifying workspaces, accessing them, moving containers to
diff --git a/include/x.h b/include/x.h
index d01709ed5a..a0aa8e1322 100644
--- a/include/x.h
+++ b/include/x.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * x.c: Interface to X11, transfers our in-memory state to X11 (see also
diff --git a/include/xcb.h b/include/xcb.h
index 93998d26e4..b3068e1864 100644
--- a/include/xcb.h
+++ b/include/xcb.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * xcb.c: Helper functions for easier usage of XCB
diff --git a/include/xcursor.h b/include/xcursor.h
index ad33d506ff..4c9c304d6c 100644
--- a/include/xcursor.h
+++ b/include/xcursor.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * xcursor.c: libXcursor support for themed cursors.
diff --git a/include/xinerama.h b/include/xinerama.h
index 52a5db3355..e3fe67fc7b 100644
--- a/include/xinerama.h
+++ b/include/xinerama.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This is LEGACY code (we support RandR, which can do much more than
diff --git a/include/yajl_utils.h b/include/yajl_utils.h
index 6ab1ff1c47..808925b080 100644
--- a/include/yajl_utils.h
+++ b/include/yajl_utils.h
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * yajl_utils.h
diff --git a/libi3/boolstr.c b/libi3/boolstr.c
index 0fa417dd8e..a97f0af771 100644
--- a/libi3/boolstr.c
+++ b/libi3/boolstr.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/create_socket.c b/libi3/create_socket.c
index d476f43a93..263ef7b385 100644
--- a/libi3/create_socket.c
+++ b/libi3/create_socket.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/dpi.c b/libi3/dpi.c
index 27281562f4..8a055843f7 100644
--- a/libi3/dpi.c
+++ b/libi3/dpi.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/fake_configure_notify.c b/libi3/fake_configure_notify.c
index 5d87c3dace..38e1bff568 100644
--- a/libi3/fake_configure_notify.c
+++ b/libi3/fake_configure_notify.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/font.c b/libi3/font.c
index 6b17505ae0..39111cb953 100644
--- a/libi3/font.c
+++ b/libi3/font.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/format_placeholders.c b/libi3/format_placeholders.c
index adcb6555a2..9542a25485 100644
--- a/libi3/format_placeholders.c
+++ b/libi3/format_placeholders.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_colorpixel.c b/libi3/get_colorpixel.c
index 9d4e91cfba..1d32481ad9 100644
--- a/libi3/get_colorpixel.c
+++ b/libi3/get_colorpixel.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_config_path.c b/libi3/get_config_path.c
index 1f2b4c05a8..c401d74142 100644
--- a/libi3/get_config_path.c
+++ b/libi3/get_config_path.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_exe_path.c b/libi3/get_exe_path.c
index 0df390a029..9f489f9300 100644
--- a/libi3/get_exe_path.c
+++ b/libi3/get_exe_path.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_mod_mask.c b/libi3/get_mod_mask.c
index ae37856887..f74378f9f3 100644
--- a/libi3/get_mod_mask.c
+++ b/libi3/get_mod_mask.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_process_filename.c b/libi3/get_process_filename.c
index d29f8db1bc..0eb2b95bb9 100644
--- a/libi3/get_process_filename.c
+++ b/libi3/get_process_filename.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/get_visualtype.c b/libi3/get_visualtype.c
index 5c785518f5..ce4b2495fc 100644
--- a/libi3/get_visualtype.c
+++ b/libi3/get_visualtype.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/ipc_connect.c b/libi3/ipc_connect.c
index 0490bc6e46..c6b945a6bf 100644
--- a/libi3/ipc_connect.c
+++ b/libi3/ipc_connect.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/ipc_recv_message.c b/libi3/ipc_recv_message.c
index 8acfd0c816..92a8cc35db 100644
--- a/libi3/ipc_recv_message.c
+++ b/libi3/ipc_recv_message.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/ipc_send_message.c b/libi3/ipc_send_message.c
index c90fd39a06..801d250deb 100644
--- a/libi3/ipc_send_message.c
+++ b/libi3/ipc_send_message.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/is_background_set.c b/libi3/is_background_set.c
index b3b6e6a636..319e52fc26 100644
--- a/libi3/is_background_set.c
+++ b/libi3/is_background_set.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/is_debug_build.c b/libi3/is_debug_build.c
index 9458f75b3c..9228b3d241 100644
--- a/libi3/is_debug_build.c
+++ b/libi3/is_debug_build.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/mkdirp.c b/libi3/mkdirp.c
index 8bdca0c33f..14016fa938 100644
--- a/libi3/mkdirp.c
+++ b/libi3/mkdirp.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/path_exists.c b/libi3/path_exists.c
index 5451c3bdda..553b1cb0e6 100644
--- a/libi3/path_exists.c
+++ b/libi3/path_exists.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/resolve_tilde.c b/libi3/resolve_tilde.c
index 6233363452..c1109dda84 100644
--- a/libi3/resolve_tilde.c
+++ b/libi3/resolve_tilde.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/root_atom_contents.c b/libi3/root_atom_contents.c
index e4150e1723..d3d23819d7 100644
--- a/libi3/root_atom_contents.c
+++ b/libi3/root_atom_contents.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/safewrappers.c b/libi3/safewrappers.c
index c82dcd9364..086f7245c9 100644
--- a/libi3/safewrappers.c
+++ b/libi3/safewrappers.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/screenshot_wallpaper.c b/libi3/screenshot_wallpaper.c
index 2c115a9e16..28a23852ec 100644
--- a/libi3/screenshot_wallpaper.c
+++ b/libi3/screenshot_wallpaper.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/string.c b/libi3/string.c
index 479ab008a9..4d280a877f 100644
--- a/libi3/string.c
+++ b/libi3/string.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * string.c: Define an i3String type to automagically handle UTF-8/UCS-2
diff --git a/libi3/strndup.c b/libi3/strndup.c
index febd1eaea1..dc491b4dcf 100644
--- a/libi3/strndup.c
+++ b/libi3/strndup.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/libi3/ucs2_conversion.c b/libi3/ucs2_conversion.c
index 7948cd7ac8..6eb51f4489 100644
--- a/libi3/ucs2_conversion.c
+++ b/libi3/ucs2_conversion.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/logo.svg b/logo.svg
index 6f87d0c53c..4324e31b67 100644
--- a/logo.svg
+++ b/logo.svg
@@ -312,7 +312,7 @@
             <dc:title>steckdenis</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description>Logo for I3, an improved dynamic tiling window manager: http://i3wm.org/</dc:description>
+        <dc:description>Logo for i3 - an improved tiling window manager: http://i3wm.org/</dc:description>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
diff --git a/man/i3.man b/man/i3.man
index b24331086a..e37aaaecc2 100644
--- a/man/i3.man
+++ b/man/i3.man
@@ -5,7 +5,7 @@ v4.3, September 2012
 
 == NAME
 
-i3 - an improved dynamic, tiling window manager
+i3 - an improved tiling window manager
 
 == SYNOPSIS
 
diff --git a/parser-specs/commands.spec b/parser-specs/commands.spec
index c0dcca7c21..c7bc3bc198 100644
--- a/parser-specs/commands.spec
+++ b/parser-specs/commands.spec
@@ -1,6 +1,6 @@
 # vim:ts=2:sw=2:expandtab
 #
-# i3 - an improved dynamic tiling window manager
+# i3 - an improved tiling window manager
 # © 2009 Michael Stapelberg and contributors (see also: LICENSE)
 #
 # parser-specs/commands.spec: Specification file for generate-command-parser.pl
diff --git a/parser-specs/config.spec b/parser-specs/config.spec
index f479db3fe6..d152837416 100644
--- a/parser-specs/config.spec
+++ b/parser-specs/config.spec
@@ -1,6 +1,6 @@
 # vim:ts=2:sw=2:expandtab
 #
-# i3 - an improved dynamic tiling window manager
+# i3 - an improved tiling window manager
 # © 2009 Michael Stapelberg and contributors (see also: LICENSE)
 #
 # parser-specs/config.spec: Specification file for generate-command-parser.pl
diff --git a/src/assignments.c b/src/assignments.c
index 916903a527..b0b7ed2036 100644
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * assignments.c: Assignments for specific windows (for_window).
diff --git a/src/bindings.c b/src/bindings.c
index a1f90f69be..1b6bcbab3f 100644
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * bindings.c: Functions for configuring, finding and, running bindings.
diff --git a/src/click.c b/src/click.c
index beac525ad7..abfc3307d3 100644
--- a/src/click.c
+++ b/src/click.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * click.c: Button press (mouse click) events.
diff --git a/src/commands.c b/src/commands.c
index 20739678d5..8d22b52617 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * commands.c: all command functions (see commands_parser.c)
diff --git a/src/commands_parser.c b/src/commands_parser.c
index 1962e6ba32..469fad5ec7 100644
--- a/src/commands_parser.c
+++ b/src/commands_parser.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * commands_parser.c: hand-written parser to parse commands (commands are what
diff --git a/src/con.c b/src/con.c
index 6daf6ce69b..f4c9918d6a 100644
--- a/src/con.c
+++ b/src/con.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * con.c: Functions which deal with containers directly (creating containers,
diff --git a/src/config.c b/src/config.c
index 98df5f5bb1..60e0702381 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config.c: Configuration file (calling the parser (src/config_parser.c) with
diff --git a/src/config_directives.c b/src/config_directives.c
index ebb25afb04..38b506fc46 100644
--- a/src/config_directives.c
+++ b/src/config_directives.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_directives.c: all config storing functions (see config_parser.c)
diff --git a/src/config_parser.c b/src/config_parser.c
index 24a26df7e7..09157d786c 100644
--- a/src/config_parser.c
+++ b/src/config_parser.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * config_parser.c: hand-written parser to parse configuration directives.
diff --git a/src/display_version.c b/src/display_version.c
index 1ea86b9d77..f8803610b3 100644
--- a/src/display_version.c
+++ b/src/display_version.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * display_version.c: displays the running i3 version, runs as part of
diff --git a/src/drag.c b/src/drag.c
index ea5a3a5393..44611c2a04 100644
--- a/src/drag.c
+++ b/src/drag.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * drag.c: click and drag.
diff --git a/src/ewmh.c b/src/ewmh.c
index d6cef4d699..3929e7c3f6 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * ewmh.c: Get/set certain EWMH properties easily.
diff --git a/src/fake_outputs.c b/src/fake_outputs.c
index 5ff7226049..7aaca37549 100644
--- a/src/fake_outputs.c
+++ b/src/fake_outputs.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * Faking outputs is useful in pathological situations (like network X servers
diff --git a/src/floating.c b/src/floating.c
index 486c0d8bd9..326866f615 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * floating.c: Floating windows.
diff --git a/src/gaps.c b/src/gaps.c
index 8b7f876374..9b4bf80615 100644
--- a/src/gaps.c
+++ b/src/gaps.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * gaps.c: gaps logic: whether to display gaps at all, and how big
diff --git a/src/handlers.c b/src/handlers.c
index 0532e151f6..c3446636b7 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * handlers.c: Small handlers for various events (keypresses, focus changes,
diff --git a/src/ipc.c b/src/ipc.c
index 03e3945c90..055350a313 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * ipc.c: UNIX domain socket IPC (initialization, client handling, protocol).
diff --git a/src/key_press.c b/src/key_press.c
index d58fe57e91..715ba30a25 100644
--- a/src/key_press.c
+++ b/src/key_press.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * key_press.c: key press handler
diff --git a/src/load_layout.c b/src/load_layout.c
index e0a81a6842..5a64fc7ae2 100644
--- a/src/load_layout.c
+++ b/src/load_layout.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * load_layout.c: Restore (parts of) the layout, for example after an inplace
diff --git a/src/log.c b/src/log.c
index c1aa876dfa..35d604ba54 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * log.c: Logging functions.
diff --git a/src/main.c b/src/main.c
index 013b82eb98..909299a5f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * main.c: Initialization, main loop
diff --git a/src/manage.c b/src/manage.c
index bb21563602..fc4db699e0 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * manage.c: Initially managing new windows (or existing ones on restart).
diff --git a/src/match.c b/src/match.c
index c794fc5f20..3acb88a789 100644
--- a/src/match.c
+++ b/src/match.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * A "match" is a data structure which acts like a mask or expression to match
diff --git a/src/move.c b/src/move.c
index 0e40648d10..f7f62c8b87 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * move.c: Moving containers into some direction.
diff --git a/src/output.c b/src/output.c
index c0872a4af3..c0cd61136c 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * output.c: Output (monitor) related functions.
diff --git a/src/randr.c b/src/randr.c
index 8fa0b01c14..efee4bf359 100644
--- a/src/randr.c
+++ b/src/randr.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * For more information on RandR, please see the X.org RandR specification at
diff --git a/src/regex.c b/src/regex.c
index 1deb0e97f3..abd4f0d888 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * regex.c: Interface to libPCRE (perl compatible regular expressions).
diff --git a/src/render.c b/src/render.c
index edd418da70..67feb51571 100644
--- a/src/render.c
+++ b/src/render.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * render.c: Renders (determines position/sizes) the layout tree, updating the
diff --git a/src/resize.c b/src/resize.c
index 7a9e82dcdc..43207fd6a3 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * resize.c: Interactive resizing.
diff --git a/src/restore_layout.c b/src/restore_layout.c
index 4e0389dcbe..c0cb7f0f4c 100644
--- a/src/restore_layout.c
+++ b/src/restore_layout.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * restore_layout.c: Everything for restored containers that is not pure state
diff --git a/src/scratchpad.c b/src/scratchpad.c
index 20c6f57854..a4bbfdab65 100644
--- a/src/scratchpad.c
+++ b/src/scratchpad.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * scratchpad.c: Moving windows to the scratchpad and making them visible again.
diff --git a/src/sighandler.c b/src/sighandler.c
index 24443accc5..ed693b3c3c 100644
--- a/src/sighandler.c
+++ b/src/sighandler.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
diff --git a/src/startup.c b/src/startup.c
index f017270833..0fe09d617d 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * startup.c: Startup notification code. Ensures a startup notification context
diff --git a/src/sync.c b/src/sync.c
index dafbc35518..b7f858d0e3 100644
--- a/src/sync.c
+++ b/src/sync.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * sync.c: i3 sync protocol: https://i3wm.org/docs/testsuite.html#i3_sync
diff --git a/src/tiling_drag.c b/src/tiling_drag.c
index 8a8786689d..4311233720 100644
--- a/src/tiling_drag.c
+++ b/src/tiling_drag.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * tiling_drag.c: Reposition tiled windows by dragging.
diff --git a/src/tree.c b/src/tree.c
index 666274fe39..3d9adcbf42 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * tree.c: Everything that primarily modifies the layout tree data structure.
diff --git a/src/util.c b/src/util.c
index 2bf8e2849f..b68f5d612d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * util.c: Utility functions, which can be useful everywhere within i3 (see
diff --git a/src/version.c b/src/version.c
index 1244711ad8..5878a10b47 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * Stores the latest Git commit identifier so that it can be linked into i3
diff --git a/src/window.c b/src/window.c
index d020fd56a1..46d0c5daab 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * window.c: Updates window attributes (X11 hints/properties).
diff --git a/src/workspace.c b/src/workspace.c
index 8c58b9a8b8..160820462c 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * workspace.c: Modifying workspaces, accessing them, moving containers to
diff --git a/src/x.c b/src/x.c
index e54896389a..36fed65372 100644
--- a/src/x.c
+++ b/src/x.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * x.c: Interface to X11, transfers our in-memory state to X11 (see also
diff --git a/src/xcb.c b/src/xcb.c
index 4cdca9d2ce..b55a406b7f 100644
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * xcb.c: Helper functions for easier usage of XCB
diff --git a/src/xcursor.c b/src/xcursor.c
index cb98399faa..1e5b72ab2b 100644
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * xcursor.c: xcursor support for themed cursors.
diff --git a/src/xinerama.c b/src/xinerama.c
index 05f85186a0..97710243dc 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * This is LEGACY code (we support RandR, which can do much more than
diff --git a/testcases/inject_randr1.5.c b/testcases/inject_randr1.5.c
index 75cbf83556..3550bd8613 100644
--- a/testcases/inject_randr1.5.c
+++ b/testcases/inject_randr1.5.c
@@ -1,7 +1,7 @@
 /*
  * vim:ts=4:sw=4:expandtab
  *
- * i3 - an improved dynamic tiling window manager
+ * i3 - an improved tiling window manager
  * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * inject_randr1.5.c: An X11 proxy which interprets RandR 1.5 GetMonitors