diff --git a/contrib/banner.svg b/contrib/banner.svg
index af82021b..74881803 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 fced8dd9..18c3299a 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 6ddc64e6..67e38ff9 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 4ca05f24..5cc92311 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 17728736..e8c240c2 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 780aa62d..96baff00 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 9b40a630..c62df438 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 21d447eb..ded5a153 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 37954739..38f7e022 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 dc8e27dd..5a03fa62 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 1f563611..bb135c9e 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 0d4dbc4e..540a7b4b 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 a4dc766b..67b5d16f 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 df3c32a5..b78a00fc 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 898f1870..7380c4f5 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 17d06681..54e3c352 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 7e1c5203..3ca21075 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 52f588b8..63107137 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 07bd29d2..0141b833 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 636fc368..0330c89f 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 523672eb..c062ae4c 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 5eade9d1..f448d263 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 6996038e..9dba20ec 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 2027f934..93a7c4f0 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 f616eb84..a4250e72 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 27a0d41a..25e42fc7 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 612874fc..781bb130 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 cb4d0093..50bff3da 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 81012e7b..18416935 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 4e2eb5c0..881efb6e 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 187640cd..50fd155c 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 e85e6081..de5a6945 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 8f23854b..a3bd8943 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 549c8e56..a07637b4 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 9205800f..fc2d7a2d 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 3a52c64d..6830584c 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 1f213cce..e65c2c39 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 22fbe527..547914a8 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 043c3a8f..5584dd11 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 830488b0..1002ba49 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 4b4a501c..06331afc 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 6fd7ea99..71429035 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 abda3cd7..388f3f7a 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 03751c01..8d61f01c 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 5439fab5..972f9f1d 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 98b257d9..ae0fc9da 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 b24ffc08..4310d8fe 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 a30852e7..1a4212a6 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 2cc20cd2..cef74bce 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 0001a77d..55c77789 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 e726f99e..b211ff29 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 3091b734..ac641c2a 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 0b758d53..e0f8d867 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 8525b6d9..925b47ae 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 7b43ab1f..49ef13ce 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 fe6d9f88..0b8304cf 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 d01709ed..a0aa8e13 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 93998d26..b3068e18 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 ad33d506..4c9c304d 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 52a5db33..e3fe67fc 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 6ab1ff1c..808925b0 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 0fa417dd..a97f0af7 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 d476f43a..263ef7b3 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 27281562..8a055843 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 5d87c3da..38e1bff5 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 6b17505a..39111cb9 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 adcb6555..9542a254 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 9d4e91cf..1d32481a 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 1f2b4c05..c401d741 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 0df390a0..9f489f93 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 ae378568..f74378f9 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 d29f8db1..0eb2b95b 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 5c785518..ce4b2495 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 0490bc6e..c6b945a6 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 8acfd0c8..92a8cc35 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 c90fd39a..801d250d 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 b3b6e6a6..319e52fc 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 9458f75b..9228b3d2 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 8bdca0c3..14016fa9 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 5451c3bd..553b1cb0 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 62333634..c1109dda 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 e4150e17..d3d23819 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 c82dcd93..086f7245 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 2c115a9e..28a23852 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 479ab008..4d280a87 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 febd1eae..dc491b4d 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 7948cd7a..6eb51f44 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 6f87d0c5..4324e31b 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 b2433108..e37aaaec 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 c0dcca7c..c7bc3bc1 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 f479db3f..d1528374 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 916903a5..b0b7ed20 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 a1f90f69..1b6bcbab 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 beac525a..abfc3307 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 20739678..8d22b526 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 1962e6ba..469fad5e 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 6daf6ce6..f4c9918d 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 98df5f5b..60e07023 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 ebb25afb..38b506fc 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 24a26df7..09157d78 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 1ea86b9d..f8803610 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 ea5a3a53..44611c2a 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 d6cef4d6..3929e7c3 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 5ff72260..7aaca375 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 486c0d8b..326866f6 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 8b7f8763..9b4bf806 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 0532e151..c3446636 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 03e3945c..055350a3 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 d58fe57e..715ba30a 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 e0a81a68..5a64fc7a 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 c1aa876d..35d604ba 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 013b82eb..909299a5 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 bb215636..fc4db699 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 c794fc5f..3acb88a7 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 0e40648d..f7f62c8b 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 c0872a4a..c0cd6113 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 8fa0b01c..efee4bf3 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 1deb0e97..abd4f0d8 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 5c4da8f6..ac1b39c4 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 7a9e82dc..43207fd6 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 4e0389dc..c0cb7f0f 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 20c6f578..a4bbfdab 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 24443acc..ed693b3c 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 f0172708..0fe09d61 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 dafbc355..b7f858d0 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 8a878668..43112337 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 666274fe..3d9adcbf 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 2bf8e284..b68f5d61 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 1244711a..5878a10b 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 d020fd56..46d0c5da 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 8c58b9a8..16082046 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 320c8d5c..6c704139 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 4cdca9d2..b55a406b 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 cb98399f..1e5b72ab 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 05f85186..97710243 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 75cbf835..3550bd86 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