From cdd63398493559238cf7c93bb76a4e6401696db3 Mon Sep 17 00:00:00 2001
From: Arthur Sonzogni <sonzogniarthur@gmail.com>
Date: Fri, 7 Jan 2022 11:03:54 +0100
Subject: [PATCH] Execute IWYU (#299)

---
 examples/component/canvas_animated.cpp | 100 +++++++++++++------------
 examples/component/collapsible.cpp     |  16 ++--
 examples/component/focus.cpp           |  14 ++--
 examples/dom/border.cpp                |   4 +-
 examples/dom/border_style.cpp          |   4 +-
 examples/dom/canvas.cpp                |  17 ++---
 examples/dom/color_info_palette256.cpp |   5 +-
 examples/dom/color_truecolor_HSV.cpp   |   5 +-
 examples/dom/color_truecolor_RGB.cpp   |   5 +-
 examples/dom/dbox.cpp                  |   4 +-
 examples/dom/gauge.cpp                 |   4 +-
 examples/dom/graph.cpp                 |   5 +-
 examples/dom/gridbox.cpp               |   4 +-
 examples/dom/hflow.cpp                 |   4 +-
 examples/dom/package_manager.cpp       |   5 +-
 examples/dom/separator.cpp             |   4 +-
 examples/dom/size.cpp                  |   4 +-
 examples/dom/spinner.cpp               |   4 +-
 examples/dom/style_blink.cpp           |   4 +-
 examples/dom/style_bold.cpp            |   4 +-
 examples/dom/style_dim.cpp             |   4 +-
 examples/dom/style_gallery.cpp         |   5 +-
 examples/dom/style_inverted.cpp        |   4 +-
 examples/dom/style_underlined.cpp      |   4 +-
 examples/dom/table.cpp                 |   5 +-
 examples/dom/vbox_hbox.cpp             |   4 +-
 examples/dom/vflow.cpp                 |   4 +-
 examples/dom/window.cpp                |   5 +-
 include/ftxui/dom/canvas.hpp           |  59 +++++++--------
 include/ftxui/screen/string.hpp        |   5 +-
 src/ftxui/component/collapsible.cpp    |  33 ++++----
 src/ftxui/component/input.cpp          |  13 ++--
 src/ftxui/component/input_test.cpp     |  11 +--
 src/ftxui/dom/benchmark_test.cpp       |   6 +-
 src/ftxui/dom/canvas.cpp               |  33 +++++---
 src/ftxui/dom/flexbox_test.cpp         |   3 +-
 src/ftxui/dom/focus.cpp                |  15 ++--
 src/ftxui/dom/gauge_test.cpp           |  10 +--
 src/ftxui/dom/gridbox_test.cpp         |  10 +--
 src/ftxui/dom/hbox_test.cpp            |   8 +-
 src/ftxui/dom/table_test.cpp           |   4 +-
 src/ftxui/dom/text_test.cpp            |  10 +--
 src/ftxui/dom/vbox_test.cpp            |   8 +-
 src/ftxui/screen/string.cpp            |   4 +-
 src/ftxui/screen/string_test.cpp       |   1 -
 src/ftxui/screen/terminal.cpp          |   6 +-
 46 files changed, 242 insertions(+), 248 deletions(-)

diff --git a/examples/component/canvas_animated.cpp b/examples/component/canvas_animated.cpp
index c3429ba6..f428c1d8 100644
--- a/examples/component/canvas_animated.cpp
+++ b/examples/component/canvas_animated.cpp
@@ -1,14 +1,19 @@
-#include <stddef.h>                // for size_t
-#include <stdio.h>                 // for getchar
-#include <ftxui/dom/elements.hpp>  // for operator|, size, Element, text, hcenter, Decorator, Fit, WIDTH, hflow, window, EQUAL, GREATER_THAN, HEIGHT, bold, border, dim, LESS_THAN
-#include <ftxui/screen/screen.hpp>  // for Full, Screen
-#include <memory>                   // for allocator, shared_ptr
-#include <string>  // for operator+, to_string, char_traits, string
+#include <cmath>                   // for sin, cos
+#include <ftxui/dom/elements.hpp>  // for canvas, Element, separator, hbox, operator|, border
+#include <ftxui/screen/screen.hpp>  // for Pixel
+#include <memory>   // for allocator, shared_ptr, __shared_ptr_access
+#include <string>   // for string, basic_string
+#include <utility>  // for move
+#include <vector>   // for vector, __alloc_traits<>::value_type
 
-#include "ftxui/component/component.hpp"
-#include "ftxui/component/screen_interactive.hpp"
+#include "ftxui/component/component.hpp"  // for Renderer, CatchEvent, Horizontal, Menu, Tab
+#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/event.hpp"               // for Event
+#include "ftxui/component/mouse.hpp"               // for Mouse
+#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
+#include "ftxui/dom/canvas.hpp"                    // for Canvas
+#include "ftxui/screen/color.hpp"  // for Color, Color::Red, Color::Blue, Color::Green, ftxui
 
-#include <cmath>
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
 
@@ -18,7 +23,7 @@ int main(int argc, const char* argv[]) {
   // A triangle following the mouse, using braille characters.
   auto renderer_line_braille = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "Several lines (braille)");
+    c.DrawText(0, 0, "Several lines (braille)");
     c.DrawPointLine(mouse_x, mouse_y, 80, 10, Color::Red);
     c.DrawPointLine(80, 10, 80, 40, Color::Blue);
     c.DrawPointLine(80, 40, mouse_x, mouse_y, Color::Green);
@@ -28,7 +33,7 @@ int main(int argc, const char* argv[]) {
   // A triangle following the mouse, using block characters.
   auto renderer_line_block = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "Several lines (block)");
+    c.DrawText(0, 0, "Several lines (block)");
     c.DrawBlockLine(mouse_x, mouse_y, 80, 10, Color::Red);
     c.DrawBlockLine(80, 10, 80, 40, Color::Blue);
     c.DrawBlockLine(80, 40, mouse_x, mouse_y, Color::Green);
@@ -38,7 +43,7 @@ int main(int argc, const char* argv[]) {
   // A circle following the mouse, using braille characters.
   auto renderer_circle_braille = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A circle (braille)");
+    c.DrawText(0, 0, "A circle (braille)");
     c.DrawPointCircle(mouse_x, mouse_y, 30);
     return canvas(std::move(c));
   });
@@ -46,7 +51,7 @@ int main(int argc, const char* argv[]) {
   // A circle following the mouse, using block characters.
   auto renderer_circle_block = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A circle (block)");
+    c.DrawText(0, 0, "A circle (block)");
     c.DrawBlockCircle(mouse_x, mouse_y, 30);
     return canvas(std::move(c));
   });
@@ -54,7 +59,7 @@ int main(int argc, const char* argv[]) {
   // A filled circle following the mouse, using braille characters.
   auto renderer_circle_filled_braille = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A circle filled (braille)");
+    c.DrawText(0, 0, "A circle filled (braille)");
     c.DrawPointCircleFilled(mouse_x, mouse_y, 30);
     return canvas(std::move(c));
   });
@@ -62,7 +67,7 @@ int main(int argc, const char* argv[]) {
   // A filled circle following the mouse, using block characters.
   auto renderer_circle_filled_block = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A circle filled (block)");
+    c.DrawText(0, 0, "A circle filled (block)");
     c.DrawBlockCircleFilled(mouse_x, mouse_y, 30);
     return canvas(std::move(c));
   });
@@ -70,7 +75,7 @@ int main(int argc, const char* argv[]) {
   // An ellipse following the mouse, using braille characters.
   auto renderer_ellipse_braille = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "An ellipse (braille)");
+    c.DrawText(0, 0, "An ellipse (braille)");
     c.DrawPointEllipse(mouse_x / 2, mouse_y / 2, mouse_x / 2, mouse_y / 2);
     return canvas(std::move(c));
   });
@@ -78,7 +83,7 @@ int main(int argc, const char* argv[]) {
   // An ellipse following the mouse, using block characters.
   auto renderer_ellipse_block = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "An ellipse (block)");
+    c.DrawText(0, 0, "An ellipse (block)");
     c.DrawBlockEllipse(mouse_x / 2, mouse_y / 2, mouse_x / 2, mouse_y / 2);
     return canvas(std::move(c));
   });
@@ -86,18 +91,18 @@ int main(int argc, const char* argv[]) {
   // An ellipse following the mouse filled, using braille characters.
   auto renderer_ellipse_filled_braille = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A filled ellipse (braille)");
+    c.DrawText(0, 0, "A filled ellipse (braille)");
     c.DrawPointEllipseFilled(mouse_x / 2, mouse_y / 2, mouse_x / 2,
-                              mouse_y / 2);
+                             mouse_y / 2);
     return canvas(std::move(c));
   });
 
   // An ellipse following the mouse filled, using block characters.
   auto renderer_ellipse_filled_block = Renderer([&] {
     auto c = Canvas(100, 100);
-    c.DrawText(0,0, "A filled ellipse (block)");
+    c.DrawText(0, 0, "A filled ellipse (block)");
     c.DrawBlockEllipseFilled(mouse_x / 2, mouse_y / 2, mouse_x / 2,
-                              mouse_y / 2);
+                             mouse_y / 2);
     c.DrawBlockEllipse(mouse_x / 2, mouse_y / 2, mouse_x / 2, mouse_y / 2);
     return canvas(std::move(c));
   });
@@ -136,13 +141,13 @@ int main(int argc, const char* argv[]) {
     c.DrawText(0, 0, "A symmetrical graph filled");
     std::vector<int> ys(100);
     for (int x = 0; x < 100; x++) {
-      ys[x] = 30 +  //
-              10 * cos(x * 0.2 - mouse_x * 0.05) + //
-              5 * sin(x * 0.4) + //
-              5 * sin(x * 0.3 - mouse_y * 0.05); //
+      ys[x] = 30 +                                  //
+              10 * cos(x * 0.2 - mouse_x * 0.05) +  //
+              5 * sin(x * 0.4) +                    //
+              5 * sin(x * 0.3 - mouse_y * 0.05);    //
     }
     for (int x = 0; x < 100; x++) {
-      c.DrawPointLine(x, 50+ys[x], x, 50-ys[x], Color::Red);
+      c.DrawPointLine(x, 50 + ys[x], x, 50 - ys[x], Color::Red);
     }
 
     return canvas(std::move(c));
@@ -153,16 +158,16 @@ int main(int argc, const char* argv[]) {
     c.DrawText(0, 0, "A 2D gaussian plot");
     int size = 15;
 
-    // mouse_x = 5mx + 3*my 
+    // mouse_x = 5mx + 3*my
     // mouse_y = 0mx + -5my + 90
     float my = (mouse_y - 90) / -5.f;
     float mx = (mouse_x - 3 * my) / 5.f;
     std::vector<std::vector<float>> ys(size, std::vector<float>(size));
     for (int y = 0; y < size; y++) {
       for (int x = 0; x < size; x++) {
-        float dx = x-mx;
-        float dy = y-my;
-        ys[y][x] = -1.5 + 3.0 * std::exp(-0.2f * (dx*dx+dy*dy));
+        float dx = x - mx;
+        float dy = y - my;
+        ys[y][x] = -1.5 + 3.0 * std::exp(-0.2f * (dx * dx + dy * dy));
       }
     }
     for (int y = 0; y < size; y++) {
@@ -183,26 +188,27 @@ int main(int argc, const char* argv[]) {
     return canvas(std::move(c));
   });
 
-
   int selected_tab = 12;
-  auto tab = Container::Tab({
-      renderer_line_braille,
-      renderer_line_block,
-      renderer_circle_braille,
-      renderer_circle_block,
-      renderer_circle_filled_braille,
-      renderer_circle_filled_block,
-      renderer_ellipse_braille,
-      renderer_ellipse_block,
-      renderer_ellipse_filled_braille,
-      renderer_ellipse_filled_block,
+  auto tab = Container::Tab(
+      {
+          renderer_line_braille,
+          renderer_line_block,
+          renderer_circle_braille,
+          renderer_circle_block,
+          renderer_circle_filled_braille,
+          renderer_circle_filled_block,
+          renderer_ellipse_braille,
+          renderer_ellipse_block,
+          renderer_ellipse_filled_braille,
+          renderer_ellipse_filled_block,
 
-      renderer_plot_1,
-      renderer_plot_2,
-      renderer_plot_3,
+          renderer_plot_1,
+          renderer_plot_2,
+          renderer_plot_3,
 
-      renderer_text,
-  }, &selected_tab);
+          renderer_text,
+      },
+      &selected_tab);
 
   // This capture the last mouse position.
   auto tab_with_mouse = CatchEvent(tab, [&](Event e) {
diff --git a/examples/component/collapsible.cpp b/examples/component/collapsible.cpp
index 45e1af0c..629f4fac 100644
--- a/examples/component/collapsible.cpp
+++ b/examples/component/collapsible.cpp
@@ -1,14 +1,12 @@
-#include <iostream>  // for basic_ostream::operator<<, operator<<, endl, basic_ostream, basic_ostream<>::__ostream_type, cout, ostream
-#include <memory>    // for shared_ptr, __shared_ptr_access
-#include <string>    // for to_string, allocator
+#include <memory>   // for allocator, make_shared, __shared_ptr_access
+#include <utility>  // for move
+#include <vector>   // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"  // for MenuEntry, Renderer, Vertical
-#include "ftxui/component/component_base.hpp"      // for ComponentBase
-#include "ftxui/component/component_options.hpp"   // for MenuEntryOption
-#include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for operator|, separator, Element, Decorator, color, text, hbox, size, bold, frame, inverted, vbox, HEIGHT, LESS_THAN, border
-#include "ftxui/screen/color.hpp"  // for Color, Color::Blue, Color::Cyan, Color::Green, Color::Red, Color::Yellow
+#include "ftxui/component/component.hpp"  // for Collapsible, Renderer, Vertical
+#include "ftxui/component/component_base.hpp"  // for ComponentBase
+#include "ftxui/component/screen_interactive.hpp"  // for Component, ScreenInteractive
+#include "ftxui/dom/elements.hpp"                  // for text, hbox, Element
 
 using namespace ftxui;
 
diff --git a/examples/component/focus.cpp b/examples/component/focus.cpp
index 50e8d600..edadfe4f 100644
--- a/examples/component/focus.cpp
+++ b/examples/component/focus.cpp
@@ -1,15 +1,13 @@
-#include <stddef.h>  // for size_t
-#include <memory>    // for shared_ptr, __shared_ptr_access, allocator
-#include <string>  // for string, basic_string, to_string, operator+, char_traits
+#include <memory>  // for allocator, shared_ptr, __shared_ptr_access
+#include <string>  // for operator+, char_traits, to_string, string
 #include <vector>  // for vector
 
 #include "ftxui/component/captured_mouse.hpp"  // for ftxui
-#include "ftxui/component/component.hpp"  // for Radiobox, Vertical, Checkbox, Horizontal, Renderer, ResizableSplitBottom, ResizableSplitRight
-#include "ftxui/component/component_base.hpp"      // for ComponentBase
+#include "ftxui/component/component.hpp"       // for Slider, Renderer, Vertical
+#include "ftxui/component/component_base.hpp"  // for ComponentBase
 #include "ftxui/component/screen_interactive.hpp"  // for ScreenInteractive
-#include "ftxui/dom/elements.hpp"  // for text, window, operator|, vbox, hbox, Element, flexbox, bgcolor, filler, flex, size, border, hcenter, color, EQUAL, bold, dim, notflex, xflex_grow, yflex_grow, HEIGHT, WIDTH
-#include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignItems, FlexboxConfig::Direction, FlexboxConfig::JustifyContent::Center, FlexboxConfig::Wrap
-#include "ftxui/screen/color.hpp"        // for Color, Color::Black
+#include "ftxui/dom/elements.hpp"  // for Elements, Element, operator|, separator, text, focusPositionRelative, size, border, flex, frame, bgcolor, gridbox, vbox, EQUAL, center, HEIGHT, WIDTH
+#include "ftxui/screen/color.hpp"  // for Color
 
 using namespace ftxui;
 
diff --git a/examples/dom/border.cpp b/examples/dom/border.cpp
index ee91bfe2..c3cc9bc0 100644
--- a/examples/dom/border.cpp
+++ b/examples/dom/border.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/border_style.cpp b/examples/dom/border_style.cpp
index 2c9780ba..f98d04e5 100644
--- a/examples/dom/border_style.cpp
+++ b/examples/dom/border_style.cpp
@@ -3,8 +3,8 @@
 #include <iostream>                 // for endl, cout, ostream
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/canvas.cpp b/examples/dom/canvas.cpp
index c5095421..6e6f5472 100644
--- a/examples/dom/canvas.cpp
+++ b/examples/dom/canvas.cpp
@@ -1,14 +1,13 @@
-#include <stddef.h>                // for size_t
 #include <stdio.h>                 // for getchar
-#include <ftxui/dom/elements.hpp>  // for operator|, size, Element, text, hcenter, Decorator, Fit, WIDTH, hflow, window, EQUAL, GREATER_THAN, HEIGHT, bold, border, dim, LESS_THAN
-#include <ftxui/screen/screen.hpp>  // for Full, Screen
-#include <memory>                   // for allocator, shared_ptr
-#include <string>  // for operator+, to_string, char_traits, string
+#include <cmath>                   // for cos
+#include <ftxui/dom/elements.hpp>  // for Fit, canvas, operator|, border, Element
+#include <ftxui/screen/screen.hpp>  // for Pixel, Screen
+#include <vector>                   // for vector, allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/canvas.hpp"  // for Canvas
+#include "ftxui/dom/node.hpp"    // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::Red, Color::Blue, Color::Green, ftxui
 
-#include <cmath>
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
 
@@ -32,7 +31,7 @@ int main(int argc, const char* argv[]) {
   std::vector<int> ys(100);
   for (int x = 0; x < 100; x++)
     ys[x] = 80 + 20 * cos(x * 0.2);
-  for (int x = 0; x < 99; x++) 
+  for (int x = 0; x < 99; x++)
     c.DrawPointLine(x, ys[x], x + 1, ys[x + 1], Color::Red);
 
   auto document = canvas(&c) | border;
diff --git a/examples/dom/color_info_palette256.cpp b/examples/dom/color_info_palette256.cpp
index e1395e61..dd58794f 100644
--- a/examples/dom/color_info_palette256.cpp
+++ b/examples/dom/color_info_palette256.cpp
@@ -4,9 +4,8 @@
 #include <utility>                      // for move
 #include <vector>                       // for vector, allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"        // for Color, Color::Palette256
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::Palette256, ftxui
 
 using namespace ftxui;
 #include "./color_info_sorted_2d.ipp"  // for ColorInfoSorted2D
diff --git a/examples/dom/color_truecolor_HSV.cpp b/examples/dom/color_truecolor_HSV.cpp
index 613f2951..9f8b7e99 100644
--- a/examples/dom/color_truecolor_HSV.cpp
+++ b/examples/dom/color_truecolor_HSV.cpp
@@ -3,9 +3,8 @@
 #include <memory>                   // for allocator
 #include <utility>                  // for move
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"        // for Color
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for Color, ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/color_truecolor_RGB.cpp b/examples/dom/color_truecolor_RGB.cpp
index 5117f5e7..c8ab0d02 100644
--- a/examples/dom/color_truecolor_RGB.cpp
+++ b/examples/dom/color_truecolor_RGB.cpp
@@ -3,9 +3,8 @@
 #include <memory>                   // for allocator
 #include <utility>                  // for move
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"        // for Color
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for Color, ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/dbox.cpp b/examples/dom/dbox.cpp
index f74b7578..642d26b0 100644
--- a/examples/dom/dbox.cpp
+++ b/examples/dom/dbox.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/gauge.cpp b/examples/dom/gauge.cpp
index 37eb102a..e8761a49 100644
--- a/examples/dom/gauge.cpp
+++ b/examples/dom/gauge.cpp
@@ -5,8 +5,8 @@
 #include <string>  // for allocator, operator+, char_traits, operator<<, string, to_string, basic_string
 #include <thread>  // for sleep_for
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/graph.cpp b/examples/dom/graph.cpp
index d5008432..4bb9a058 100644
--- a/examples/dom/graph.cpp
+++ b/examples/dom/graph.cpp
@@ -8,9 +8,8 @@
 #include <thread>                   // for sleep_for
 #include <vector>                   // for vector
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"  // for Color, Color::BlueLight, Color::RedLight, Color::YellowLight
+#include "ftxui/dom/node.hpp"  // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::BlueLight, Color::RedLight, Color::YellowLight, ftxui
 
 class Graph {
  public:
diff --git a/examples/dom/gridbox.cpp b/examples/dom/gridbox.cpp
index 355f3f7a..3de7b55b 100644
--- a/examples/dom/gridbox.cpp
+++ b/examples/dom/gridbox.cpp
@@ -3,8 +3,8 @@
 #include <ftxui/screen/screen.hpp>  // for Screen
 #include <memory>                   // for allocator, shared_ptr
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/hflow.cpp b/examples/dom/hflow.cpp
index e98d2aff..36eb576d 100644
--- a/examples/dom/hflow.cpp
+++ b/examples/dom/hflow.cpp
@@ -5,8 +5,8 @@
 #include <memory>                   // for allocator, shared_ptr
 #include <string>  // for operator+, to_string, char_traits, string
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/package_manager.cpp b/examples/dom/package_manager.cpp
index ee6434ae..8d5e8311 100644
--- a/examples/dom/package_manager.cpp
+++ b/examples/dom/package_manager.cpp
@@ -9,9 +9,8 @@
 #include <utility>  // for move
 #include <vector>   // for vector
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"  // for Color, Color::Green, Color::Red, Color::RedLight
+#include "ftxui/dom/node.hpp"  // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::Green, Color::Red, Color::RedLight, ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/separator.cpp b/examples/dom/separator.cpp
index 382e1a3f..00c0e684 100644
--- a/examples/dom/separator.cpp
+++ b/examples/dom/separator.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/size.cpp b/examples/dom/size.cpp
index 7ea574fe..0bcf997c 100644
--- a/examples/dom/size.cpp
+++ b/examples/dom/size.cpp
@@ -4,8 +4,8 @@
 #include <string>                   // for string, to_string
 #include <utility>                  // for move
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/spinner.cpp b/examples/dom/spinner.cpp
index 6c64d2cb..821f7400 100644
--- a/examples/dom/spinner.cpp
+++ b/examples/dom/spinner.cpp
@@ -7,8 +7,8 @@
 #include <utility>                  // for move
 #include <vector>                   // for vector
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_blink.cpp b/examples/dom/style_blink.cpp
index 889c22c8..d463d282 100644
--- a/examples/dom/style_blink.cpp
+++ b/examples/dom/style_blink.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_bold.cpp b/examples/dom/style_bold.cpp
index 936a9d30..4322aba0 100644
--- a/examples/dom/style_bold.cpp
+++ b/examples/dom/style_bold.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_dim.cpp b/examples/dom/style_dim.cpp
index f4073c76..6d5862ee 100644
--- a/examples/dom/style_dim.cpp
+++ b/examples/dom/style_dim.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_gallery.cpp b/examples/dom/style_gallery.cpp
index c370357f..9303e67e 100644
--- a/examples/dom/style_gallery.cpp
+++ b/examples/dom/style_gallery.cpp
@@ -2,9 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"        // for Color, Color::Blue
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::Blue, ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_inverted.cpp b/examples/dom/style_inverted.cpp
index b6d1a7f8..56e51039 100644
--- a/examples/dom/style_inverted.cpp
+++ b/examples/dom/style_inverted.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/style_underlined.cpp b/examples/dom/style_underlined.cpp
index 684b2461..dde6e800 100644
--- a/examples/dom/style_underlined.cpp
+++ b/examples/dom/style_underlined.cpp
@@ -2,8 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/table.cpp b/examples/dom/table.cpp
index afc072f6..947abcf1 100644
--- a/examples/dom/table.cpp
+++ b/examples/dom/table.cpp
@@ -5,9 +5,8 @@
 #include <string>                   // for basic_string, allocator, string
 #include <vector>                   // for vector
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"  // for Color, Color::Blue, Color::Cyan, Color::White
+#include "ftxui/dom/node.hpp"  // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::Blue, Color::Cyan, Color::White, ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/vbox_hbox.cpp b/examples/dom/vbox_hbox.cpp
index 7bf13725..a4e6c81d 100644
--- a/examples/dom/vbox_hbox.cpp
+++ b/examples/dom/vbox_hbox.cpp
@@ -3,8 +3,8 @@
 #include <ftxui/screen/screen.hpp>  // for Full, Screen
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/vflow.cpp b/examples/dom/vflow.cpp
index 4f642ca5..30c910a5 100644
--- a/examples/dom/vflow.cpp
+++ b/examples/dom/vflow.cpp
@@ -5,8 +5,8 @@
 #include <memory>                   // for allocator, shared_ptr
 #include <string>  // for operator+, to_string, char_traits, string
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
 
 int main(int argc, const char* argv[]) {
   using namespace ftxui;
diff --git a/examples/dom/window.cpp b/examples/dom/window.cpp
index 95d60047..6de7ee1d 100644
--- a/examples/dom/window.cpp
+++ b/examples/dom/window.cpp
@@ -2,9 +2,8 @@
 #include <ftxui/screen/screen.hpp>  // for Fixed, Screen
 #include <vector>                   // for vector
 
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/color.hpp"  // for Color, Color::DarkBlue, Color::Green, Color::Red
+#include "ftxui/dom/node.hpp"  // for Render
+#include "ftxui/screen/color.hpp"  // for Color, Color::DarkBlue, Color::Green, Color::Red, ftxui
 
 int main(void) {
   using namespace ftxui;
diff --git a/include/ftxui/dom/canvas.hpp b/include/ftxui/dom/canvas.hpp
index b2113b56..addf16bd 100644
--- a/include/ftxui/dom/canvas.hpp
+++ b/include/ftxui/dom/canvas.hpp
@@ -1,10 +1,13 @@
 #ifndef FTXUI_DOM_CANVAS_HPP
 #define FTXUI_DOM_CANVAS_HPP
 
-#include "ftxui/screen/color.hpp"
-#include "ftxui/screen/screen.hpp"
-#include <unordered_map>
-#include <functional>
+#include <stddef.h>       // for size_t
+#include <functional>     // for function
+#include <string>         // for string
+#include <unordered_map>  // for unordered_map
+
+#include "ftxui/screen/color.hpp"   // for Color
+#include "ftxui/screen/screen.hpp"  // for Pixel
 
 namespace ftxui {
 
@@ -34,25 +37,14 @@ struct Canvas {
   void DrawPointCircle(int x, int y, int radius, const Stylizer& s);
   void DrawPointCircle(int x, int y, int radius, const Color& color);
   void DrawPointCircleFilled(int x, int y, int radius);
-  void DrawPointCircleFilled(int x,
-                             int y,
-                             int radius,
-                             const Stylizer& s);
+  void DrawPointCircleFilled(int x, int y, int radius, const Stylizer& s);
   void DrawPointCircleFilled(int x, int y, int radius, const Color& color);
   void DrawPointEllipse(int x, int y, int r1, int r2);
   void DrawPointEllipse(int x, int y, int r1, int r2, const Color& color);
   void DrawPointEllipse(int x, int y, int r1, int r2, const Stylizer& s);
   void DrawPointEllipseFilled(int x, int y, int r1, int r2);
-  void DrawPointEllipseFilled(int x,
-                               int y,
-                               int r1,
-                               int r2,
-                               const Color& color);
-  void DrawPointEllipseFilled(int x,
-                               int y,
-                               int r1,
-                               int r2,
-                               const Stylizer& s);
+  void DrawPointEllipseFilled(int x, int y, int r1, int r2, const Color& color);
+  void DrawPointEllipseFilled(int x, int y, int r1, int r2, const Stylizer& s);
 
   // Draw using box characters -------------------------------------------------
   // Block are of size 1x2. y is considered to be a multiple of 2.
@@ -76,15 +68,15 @@ struct Canvas {
   void DrawBlockEllipse(int x1, int y1, int r1, int r2, const Color& color);
   void DrawBlockEllipseFilled(int x1, int y1, int r1, int r2);
   void DrawBlockEllipseFilled(int x1,
-                               int y1,
-                               int r1,
-                               int r2,
-                               const Stylizer& s);
+                              int y1,
+                              int r1,
+                              int r2,
+                              const Stylizer& s);
   void DrawBlockEllipseFilled(int x1,
-                               int y1,
-                               int r1,
-                               int r2,
-                               const Color& color);
+                              int y1,
+                              int r1,
+                              int r2,
+                              const Color& color);
 
   // Draw using normal characters ----------------------------------------------
   // Draw using character of size 2x4 at position (x,y)
@@ -92,10 +84,7 @@ struct Canvas {
   // y is considered to be a multiple of 4.
   void DrawText(int x, int y, const std::string& value);
   void DrawText(int x, int y, const std::string& value, const Color& color);
-  void DrawText(int x,
-                int y,
-                const std::string& value,
-                const Stylizer& style);
+  void DrawText(int x, int y, const std::string& value, const Stylizer& style);
 
   // Decorator:
   // x is considered to be a multiple of 2.
@@ -124,7 +113,9 @@ struct Canvas {
   };
 
   struct XYHash {
-    size_t operator()(const XY& xy) const { return static_cast<size_t>(xy.x * 1024 + xy.y); }
+    size_t operator()(const XY& xy) const {
+      return static_cast<size_t>(xy.x * 1024 + xy.y);
+    }
   };
 
   int width_ = 0;
@@ -134,4 +125,8 @@ struct Canvas {
 
 }  // namespace ftxui
 
-#endif // FTXUI_DOM_CANVAS_HPP
+#endif  // FTXUI_DOM_CANVAS_HPP
+
+// Copyright 2021 Arthur Sonzogni. All rights reserved.
+// Use of this source code is governed by the MIT license that can be found in
+// the LICENSE file.
diff --git a/include/ftxui/screen/string.hpp b/include/ftxui/screen/string.hpp
index 21783ec2..cfc37710 100644
--- a/include/ftxui/screen/string.hpp
+++ b/include/ftxui/screen/string.hpp
@@ -1,8 +1,9 @@
 #ifndef FTXUI_SCREEN_STRING_HPP
 #define FTXUI_SCREEN_STRING_HPP
 
-#include <string>  // for string, wstring, to_string
-#include <vector>  // for vector
+#include <stddef.h>  // for size_t
+#include <string>    // for string, wstring, to_string
+#include <vector>    // for vector
 
 namespace ftxui {
 std::string to_string(const std::wstring& s);
diff --git a/src/ftxui/component/collapsible.cpp b/src/ftxui/component/collapsible.cpp
index c7b74ec5..19afeba8 100644
--- a/src/ftxui/component/collapsible.cpp
+++ b/src/ftxui/component/collapsible.cpp
@@ -1,11 +1,10 @@
-#include <memory>  // for make_unique, __shared_ptr_access, __shared_ptr_access<>::element_type, shared_ptr
+#include <string>   // for string
 #include <utility>  // for move
 
-#include "ftxui/component/component.hpp"       // for Make, Collapsible
-#include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
-#include "ftxui/component/event.hpp"           // for Event
-#include "ftxui/dom/elements.hpp"              // for Element
-#include "ftxui/dom/node.hpp"                  // for Node
+#include "ftxui/component/component.hpp"  // for Checkbox, Maybe, Make, Vertical, Collapsible
+#include "ftxui/component/component_base.hpp"  // for Component, ComponentBase
+#include "ftxui/component/component_options.hpp"  // for CheckboxOption
+#include "ftxui/util/ref.hpp"                     // for Ref, ConstStringRef
 
 namespace ftxui {
 
@@ -14,7 +13,7 @@ namespace ftxui {
 /// @params label The label of the checkbox.
 /// @params child The children to display.
 /// @params show Hold the state about whether the children is displayed or not.
-/// 
+///
 /// ### Example
 /// ```cpp
 /// auto component = Collapsible("Show details", details);
@@ -22,24 +21,22 @@ namespace ftxui {
 ///
 /// ### Output
 /// ```
-/// 
+///
 /// ▼ Show details
 /// <details component>
 /// ```
-Component Collapsible(ConstStringRef label,
-                      Component child,
-                      Ref<bool> show) {
+Component Collapsible(ConstStringRef label, Component child, Ref<bool> show) {
   class Impl : public ComponentBase {
    public:
     Impl(ConstStringRef label, Component child, Ref<bool> show)
         : label_(label), show_(std::move(show)) {
-          CheckboxOption opt;
-          opt.style_checked = "▼ ";
-          opt.style_unchecked = "▶ ";
-          Add(Container::Vertical({
-              Checkbox(label_, show_.operator->(), opt),
-              Maybe(std::move(child), show_.operator->()),
-          }));
+      CheckboxOption opt;
+      opt.style_checked = "▼ ";
+      opt.style_unchecked = "▶ ";
+      Add(Container::Vertical({
+          Checkbox(label_, show_.operator->(), opt),
+          Maybe(std::move(child), show_.operator->()),
+      }));
     }
     ConstStringRef label_;
     Ref<bool> show_;
diff --git a/src/ftxui/component/input.cpp b/src/ftxui/component/input.cpp
index 13a23800..b04b9401 100644
--- a/src/ftxui/component/input.cpp
+++ b/src/ftxui/component/input.cpp
@@ -1,8 +1,10 @@
-#include <algorithm>   // for max, min
+#include <stddef.h>    // for size_t
+#include <algorithm>   // for clamp, max, min
 #include <functional>  // for function
 #include <memory>      // for shared_ptr, allocator
-#include <string>      // for wstring, basic_string
+#include <string>      // for string, wstring
 #include <utility>     // for move
+#include <vector>      // for vector
 
 #include "ftxui/component/captured_mouse.hpp"     // for CapturedMouse
 #include "ftxui/component/component.hpp"          // for Make, Input
@@ -12,11 +14,10 @@
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Backspace, Event::Custom, Event::Delete, Event::End, Event::Home, Event::Return
 #include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::Left, Mouse::Pressed
 #include "ftxui/component/screen_interactive.hpp"  // for Component
-#include "ftxui/dom/deprecated.hpp"                // for text
-#include "ftxui/dom/elements.hpp"  // for operator|, Element, reflect, text, dim, flex, focus, inverted, hbox, size, frame, select, underlined, Decorator, EQUAL, HEIGHT
+#include "ftxui/dom/elements.hpp"  // for operator|, text, Element, reflect, inverted, Decorator, flex, focus, hbox, size, bold, dim, frame, select, EQUAL, HEIGHT
 #include "ftxui/screen/box.hpp"    // for Box
-#include "ftxui/screen/string.hpp"  // for to_wstring, to_string
-#include "ftxui/util/ref.hpp"  // for WideStringRef, Ref, ConstStringRef, StringRef
+#include "ftxui/screen/string.hpp"  // for GlyphPosition, GlyphCount, to_string, CellToGlyphIndex, to_wstring
+#include "ftxui/util/ref.hpp"  // for StringRef, Ref, WideStringRef, ConstStringRef
 
 namespace ftxui {
 
diff --git a/src/ftxui/component/input_test.cpp b/src/ftxui/component/input_test.cpp
index c12cf18a..7cd16f99 100644
--- a/src/ftxui/component/input_test.cpp
+++ b/src/ftxui/component/input_test.cpp
@@ -8,11 +8,12 @@
 #include "ftxui/component/component_base.hpp"  // for ComponentBase, Component
 #include "ftxui/component/component_options.hpp"  // for InputOption
 #include "ftxui/component/event.hpp"  // for Event, Event::ArrowLeft, Event::ArrowRight, Event::Backspace, Event::Delete, Event::End, Event::Home
-#include "ftxui/dom/elements.hpp"     // for Fit
-#include "ftxui/dom/node.hpp"         // for Render
-#include "ftxui/screen/screen.hpp"    // for Screen, Pixel
-#include "ftxui/util/ref.hpp"         // for Ref
-#include "gtest/gtest_pred_impl.h"    // for Test, EXPECT_EQ, TEST
+#include "ftxui/component/mouse.hpp"  // for Mouse, Mouse::Button, Mouse::Left, Mouse::Motion, Mouse::Pressed
+#include "ftxui/dom/elements.hpp"   // for Fit
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/screen.hpp"  // for Fixed, Screen, Pixel
+#include "ftxui/util/ref.hpp"       // for Ref
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 
diff --git a/src/ftxui/dom/benchmark_test.cpp b/src/ftxui/dom/benchmark_test.cpp
index 9871336a..800b6200 100644
--- a/src/ftxui/dom/benchmark_test.cpp
+++ b/src/ftxui/dom/benchmark_test.cpp
@@ -1,9 +1,9 @@
 #include <benchmark/benchmark.h>
 
 #include "ftxui/dom/elements.hpp"  // for separator, gauge, operator|, text, Element, blink, inverted, hbox, vbox, border
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
 
 using namespace ftxui;
 
diff --git a/src/ftxui/dom/canvas.cpp b/src/ftxui/dom/canvas.cpp
index ef39ed63..c031ab67 100644
--- a/src/ftxui/dom/canvas.cpp
+++ b/src/ftxui/dom/canvas.cpp
@@ -1,9 +1,20 @@
 #include "ftxui/dom/canvas.hpp"
 
-#include <map>
+#include <stdlib.h>   // for abs
+#include <algorithm>  // for max, min
+#include <cstdint>    // for uint8_t
+#include <map>        // for allocator, map
+#include <memory>     // for make_shared
+#include <utility>    // for move, pair
+#include <vector>     // for vector
 
-#include "ftxui/dom/elements.hpp"
-#include "ftxui/screen/screen.hpp"
+#include "ftxui/dom/elements.hpp"     // for Element, canvas
+#include "ftxui/dom/node.hpp"         // for Node
+#include "ftxui/dom/requirement.hpp"  // for Requirement
+#include "ftxui/screen/box.hpp"       // for Box
+#include "ftxui/screen/screen.hpp"    // for Pixel, Screen
+#include "ftxui/screen/string.hpp"    // for Utf8ToGlyphs
+#include "ftxui/util/ref.hpp"         // for ConstRef
 
 namespace ftxui {
 
@@ -233,10 +244,7 @@ void Canvas::DrawPointCircle(int x, int y, int radius, const Color& color) {
 /// @param y the y coordinate of the center of the circle.
 /// @param radius the radius of the circle.
 /// @param style the style of the circle.
-void Canvas::DrawPointCircle(int x,
-                             int y,
-                             int radius,
-                             const Stylizer& style) {
+void Canvas::DrawPointCircle(int x, int y, int radius, const Stylizer& style) {
   DrawPointEllipse(x, y, radius, radius, style);
 }
 
@@ -573,10 +581,7 @@ void Canvas::DrawBlockCircle(int x, int y, int radius, const Color& color) {
 /// @param y the y coordinate of the center of the circle.
 /// @param radius the radius of the circle.
 /// @param style the style of the circle.
-void Canvas::DrawBlockCircle(int x,
-                             int y,
-                             int radius,
-                             const Stylizer& style) {
+void Canvas::DrawBlockCircle(int x, int y, int radius, const Stylizer& style) {
   DrawBlockEllipse(x, y, radius, radius, style);
 }
 
@@ -782,7 +787,7 @@ void Canvas::DrawText(int x,
     cell.type = CellType::kText;
     cell.content.character = it;
     style(cell.content);
-    x+=2;
+    x += 2;
   }
 }
 
@@ -868,3 +873,7 @@ Element canvas(std::function<void(Canvas&)> fn) {
 }
 
 }  // namespace ftxui
+
+// Copyright 2021 Arthur Sonzogni. All rights reserved.
+// Use of this source code is governed by the MIT license that can be found in
+// the LICENSE file.
diff --git a/src/ftxui/dom/flexbox_test.cpp b/src/ftxui/dom/flexbox_test.cpp
index 4c71e994..c284dc55 100644
--- a/src/ftxui/dom/flexbox_test.cpp
+++ b/src/ftxui/dom/flexbox_test.cpp
@@ -3,8 +3,9 @@
 #include <string>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"        // for text, flexbox
-#include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween, ftxui
+#include "ftxui/dom/flexbox_config.hpp"  // for FlexboxConfig, FlexboxConfig::Direction, FlexboxConfig::AlignContent, FlexboxConfig::JustifyContent, FlexboxConfig::Direction::Column, FlexboxConfig::AlignItems, FlexboxConfig::JustifyContent::SpaceAround, FlexboxConfig::AlignContent::Center, FlexboxConfig::AlignContent::FlexEnd, FlexboxConfig::AlignContent::SpaceAround, FlexboxConfig::AlignContent::SpaceBetween, FlexboxConfig::AlignContent::SpaceEvenly, FlexboxConfig::AlignItems::Center, FlexboxConfig::AlignItems::FlexEnd, FlexboxConfig::Direction::ColumnInversed, FlexboxConfig::Direction::Row, FlexboxConfig::Direction::RowInversed, FlexboxConfig::JustifyContent::Center, FlexboxConfig::JustifyContent::SpaceBetween
 #include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/screen/color.hpp"        // for ftxui
 #include "ftxui/screen/screen.hpp"       // for Screen
 #include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
 
diff --git a/src/ftxui/dom/focus.cpp b/src/ftxui/dom/focus.cpp
index 8470ecd8..1dffb4ee 100644
--- a/src/ftxui/dom/focus.cpp
+++ b/src/ftxui/dom/focus.cpp
@@ -1,22 +1,17 @@
 #include <memory>   // for make_shared
 #include <utility>  // for move
 
-#include "ftxui/dom/elements.hpp"        // for Element, bold
-#include "ftxui/dom/node.hpp"            // for Node
+#include "ftxui/dom/elements.hpp"  // for Decorator, Element, focusPosition, focusPositionRelative
 #include "ftxui/dom/node_decorator.hpp"  // for NodeDecorator
-#include "ftxui/screen/box.hpp"          // for Box
-#include "ftxui/screen/screen.hpp"       // for Pixel, Screen
+#include "ftxui/dom/requirement.hpp"  // for Requirement, Requirement::NORMAL, Requirement::Selection
+#include "ftxui/screen/box.hpp"  // for Box
 
 namespace ftxui {
 
-namespace {
-
-}  // namespace
-
 /// @brief Used inside a `frame`, this force the view to be scrolled toward a
 /// a given position. The position is expressed in proportion of the requested
 /// size.
-/// 
+///
 /// For instance:
 /// - (0, 0) means that the view is scrolled toward the upper left.
 /// - (1, 0) means that the view is scrolled toward the upper right.
@@ -59,7 +54,7 @@ Decorator focusPositionRelative(float x, float y) {
 
 /// @brief Used inside a `frame`, this force the view to be scrolled toward a
 /// a given position. The position is expressed in the numbers of cells.
-/// 
+///
 /// @ingroup dom
 ///
 /// ### Example
diff --git a/src/ftxui/dom/gauge_test.cpp b/src/ftxui/dom/gauge_test.cpp
index 9ebb8779..ced0d546 100644
--- a/src/ftxui/dom/gauge_test.cpp
+++ b/src/ftxui/dom/gauge_test.cpp
@@ -2,11 +2,11 @@
 #include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
 #include <memory>                   // for allocator
 
-#include "ftxui/dom/elements.hpp"        // for gauge
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/elements.hpp"   // for gauge
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 using namespace ftxui;
diff --git a/src/ftxui/dom/gridbox_test.cpp b/src/ftxui/dom/gridbox_test.cpp
index 48cde9cd..aa200c16 100644
--- a/src/ftxui/dom/gridbox_test.cpp
+++ b/src/ftxui/dom/gridbox_test.cpp
@@ -4,11 +4,11 @@
 #include <string>                   // for allocator, basic_string, string
 #include <vector>                   // for vector
 
-#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, flex_grow, Elements, flex_shrink, vtext, gridbox, vbox, border
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, TEST, EXPECT_EQ
+#include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex, Elements, flex_grow, flex_shrink, vtext, gridbox, vbox, border
+#include "ftxui/dom/node.hpp"      // for Render
+#include "ftxui/screen/color.hpp"  // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, TEST, EXPECT_EQ
 
 using namespace ftxui;
 
diff --git a/src/ftxui/dom/hbox_test.cpp b/src/ftxui/dom/hbox_test.cpp
index 71c0d3f4..a084c81a 100644
--- a/src/ftxui/dom/hbox_test.cpp
+++ b/src/ftxui/dom/hbox_test.cpp
@@ -4,10 +4,10 @@
 #include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for text, operator|, Element, flex_grow, flex_shrink, hbox
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 using namespace ftxui;
diff --git a/src/ftxui/dom/table_test.cpp b/src/ftxui/dom/table_test.cpp
index 4de0ef41..de72ba0c 100644
--- a/src/ftxui/dom/table_test.cpp
+++ b/src/ftxui/dom/table_test.cpp
@@ -3,9 +3,9 @@
 #include <memory>                   // for allocator
 
 #include "ftxui/dom/elements.hpp"  // for LIGHT, flex, center, EMPTY, DOUBLE
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
+#include "ftxui/dom/node.hpp"      // for Render
 #include "ftxui/dom/table.hpp"
+#include "ftxui/screen/color.hpp"   // for ftxui
 #include "ftxui/screen/screen.hpp"  // for Screen
 #include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
diff --git a/src/ftxui/dom/text_test.cpp b/src/ftxui/dom/text_test.cpp
index 8e6fe27f..d7639324 100644
--- a/src/ftxui/dom/text_test.cpp
+++ b/src/ftxui/dom/text_test.cpp
@@ -2,11 +2,11 @@
 #include <gtest/gtest-test-part.h>  // for SuiteApiResolver, TestFactoryImpl, TestPartResult
 #include <string>                   // for allocator, string
 
-#include "ftxui/dom/elements.hpp"        // for text, operator|, border, Element
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/elements.hpp"   // for text, operator|, border, Element
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 
diff --git a/src/ftxui/dom/vbox_test.cpp b/src/ftxui/dom/vbox_test.cpp
index 9eee8523..4a11bf14 100644
--- a/src/ftxui/dom/vbox_test.cpp
+++ b/src/ftxui/dom/vbox_test.cpp
@@ -5,10 +5,10 @@
 #include <vector>                   // for vector
 
 #include "ftxui/dom/elements.hpp"  // for vtext, operator|, Element, flex_grow, flex_shrink, vbox
-#include "ftxui/dom/flexbox_config.hpp"  // for ftxui
-#include "ftxui/dom/node.hpp"            // for Render
-#include "ftxui/screen/screen.hpp"       // for Screen
-#include "gtest/gtest_pred_impl.h"       // for Test, EXPECT_EQ, TEST
+#include "ftxui/dom/node.hpp"       // for Render
+#include "ftxui/screen/color.hpp"   // for ftxui
+#include "ftxui/screen/screen.hpp"  // for Screen
+#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
 
 using namespace ftxui;
 
diff --git a/src/ftxui/screen/string.cpp b/src/ftxui/screen/string.cpp
index 49ad6159..5d983071 100644
--- a/src/ftxui/screen/string.cpp
+++ b/src/ftxui/screen/string.cpp
@@ -288,7 +288,9 @@ std::vector<std::string> Utf8ToGlyphs(const std::string& input) {
   return out;
 }
 
-int GlyphPosition(const std::string& input, size_t glyph_to_skip, size_t start) {
+int GlyphPosition(const std::string& input,
+                  size_t glyph_to_skip,
+                  size_t start) {
   if (glyph_to_skip <= 0)
     return 0;
   size_t end = 0;
diff --git a/src/ftxui/screen/string_test.cpp b/src/ftxui/screen/string_test.cpp
index 5d161228..0aff5ad3 100644
--- a/src/ftxui/screen/string_test.cpp
+++ b/src/ftxui/screen/string_test.cpp
@@ -59,7 +59,6 @@ TEST(StringTest, GlyphCount) {
   EXPECT_EQ(GlyphCount("a\1a"), 2);
 }
 
-
 TEST(StringTest, GlyphPosition) {
   // Basic:
   EXPECT_EQ(GlyphPosition("", -1), 0);
diff --git a/src/ftxui/screen/terminal.cpp b/src/ftxui/screen/terminal.cpp
index 11f3369a..24b03ec0 100644
--- a/src/ftxui/screen/terminal.cpp
+++ b/src/ftxui/screen/terminal.cpp
@@ -23,7 +23,7 @@ namespace ftxui {
 // https://arthursonzogni.com/FTXUI/examples
 // This will have to be improved when someone has time to implement and need
 // it.
-static Dimensions fallback_size {140, 43};
+static Dimensions fallback_size{140, 43};
 Dimensions Terminal::Size() {
   return fallback_size;
 }
@@ -33,7 +33,7 @@ Dimensions Terminal::Size() {
 // The terminal size in VT100 was 80x24. It is still used nowadays by
 // default in many terminal emulator. That's a good choice for a fallback
 // value.
-static Dimensions fallback_size {80, 24};
+static Dimensions fallback_size{80, 24};
 Dimensions Terminal::Size() {
   CONSOLE_SCREEN_BUFFER_INFO csbi;
 
@@ -49,7 +49,7 @@ Dimensions Terminal::Size() {
 // The terminal size in VT100 was 80x24. It is still used nowadays by
 // default in many terminal emulator. That's a good choice for a fallback
 // value.
-static Dimensions fallback_size {80, 24};
+static Dimensions fallback_size{80, 24};
 Dimensions Terminal::Size() {
   winsize w{};
   const int status = ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);