diff --git a/src/pixel-display.toit b/src/pixel-display-impl_.toit
similarity index 99%
rename from src/pixel-display.toit
rename to src/pixel-display-impl_.toit
index 4e03e8e..1672a8d 100644
--- a/src/pixel-display.toit
+++ b/src/pixel-display-impl_.toit
@@ -23,6 +23,7 @@ import .several-color as several-color
 import .one-byte_ as one-byte
 import .style
 
+
 FLAG-2-COLOR ::=         0b1
 FLAG-3-COLOR ::=         0b10
 FLAG-4-COLOR ::=         0b100
diff --git a/tests/barcode-visualized.toit b/tests/barcode-visualized.toit
index 24b9ce7..b7ca13c 100644
--- a/tests/barcode-visualized.toit
+++ b/tests/barcode-visualized.toit
@@ -7,8 +7,6 @@
 import expect show *
 import pixel-display show *
 import pixel-display.bar-code show *
-import pixel-display.element show *
-import pixel-display.style show Style
 import .png-visualizer
 
 main args:
diff --git a/tests/bitmap-2-visualized.toit b/tests/bitmap-2-visualized.toit
index 97c3627..3093005 100644
--- a/tests/bitmap-2-visualized.toit
+++ b/tests/bitmap-2-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.png show Png
 import .png-visualizer
 
diff --git a/tests/bitmap-visualized.toit b/tests/bitmap-visualized.toit
index 979ce61..4b1a6d6 100644
--- a/tests/bitmap-visualized.toit
+++ b/tests/bitmap-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import pixel-display.png show Png
 import .png-visualizer
diff --git a/tests/drop-shadow-gray-window-visualized.toit b/tests/drop-shadow-gray-window-visualized.toit
index 3adb310..9df7175 100644
--- a/tests/drop-shadow-gray-window-visualized.toit
+++ b/tests/drop-shadow-gray-window-visualized.toit
@@ -5,9 +5,7 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/drop-shadow-window-visualized.toit b/tests/drop-shadow-window-visualized.toit
index 0826657..bee7513 100644
--- a/tests/drop-shadow-window-visualized.toit
+++ b/tests/drop-shadow-window-visualized.toit
@@ -5,9 +5,7 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/four-gray-bitmap-2-visualized.toit b/tests/four-gray-bitmap-2-visualized.toit
index ccffcf3..92da392 100644
--- a/tests/four-gray-bitmap-2-visualized.toit
+++ b/tests/four-gray-bitmap-2-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.four-gray show WHITE LIGHT-GRAY
 import pixel-display.png show Png
 import .png-visualizer
diff --git a/tests/gradient-bounds-visualized.toit b/tests/gradient-bounds-visualized.toit
index 6be5b92..9d5347d 100644
--- a/tests/gradient-bounds-visualized.toit
+++ b/tests/gradient-bounds-visualized.toit
@@ -9,7 +9,6 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import .png-visualizer
 
diff --git a/tests/gradient-style-visualized.toit b/tests/gradient-style-visualized.toit
index 61d7f5d..cc40e61 100644
--- a/tests/gradient-style-visualized.toit
+++ b/tests/gradient-style-visualized.toit
@@ -9,9 +9,7 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/gradient-visualized.toit b/tests/gradient-visualized.toit
index 24d825a..df31c38 100644
--- a/tests/gradient-visualized.toit
+++ b/tests/gradient-visualized.toit
@@ -9,7 +9,6 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import .png-visualizer
 
diff --git a/tests/gray-scale-bitmap-2-visualized.toit b/tests/gray-scale-bitmap-2-visualized.toit
index 6814c84..499e4a1 100644
--- a/tests/gray-scale-bitmap-2-visualized.toit
+++ b/tests/gray-scale-bitmap-2-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.png show Png
 import .png-visualizer
 
diff --git a/tests/gray-scale-visualized.toit b/tests/gray-scale-visualized.toit
index f4ae679..844503f 100644
--- a/tests/gray-scale-visualized.toit
+++ b/tests/gray-scale-visualized.toit
@@ -6,7 +6,6 @@ import expect show *
 import font show Font
 import pixel-display show *
 import pixel-display.gray-scale show *
-import pixel-display.element show *
 import .png-visualizer
 
 main args:
diff --git a/tests/horizontal-slider-visualized.toit b/tests/horizontal-slider-visualized.toit
index 5dc24e1..f949a83 100644
--- a/tests/horizontal-slider-visualized.toit
+++ b/tests/horizontal-slider-visualized.toit
@@ -9,10 +9,8 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import pixel-display.slider show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/icons-visualized.toit b/tests/icons-visualized.toit
index e79b436..09626a0 100644
--- a/tests/icons-visualized.toit
+++ b/tests/icons-visualized.toit
@@ -8,9 +8,7 @@ import icons show Icon
 
 import pictogrammers-icons.size-40 show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 
 import .png-visualizer
 
diff --git a/tests/mixed-text-rotated-visualized.toit b/tests/mixed-text-rotated-visualized.toit
index e5e0abd..d793d8e 100644
--- a/tests/mixed-text-rotated-visualized.toit
+++ b/tests/mixed-text-rotated-visualized.toit
@@ -9,8 +9,6 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/mixed-text-visualized.toit b/tests/mixed-text-visualized.toit
index f5a95e4..db50a27 100644
--- a/tests/mixed-text-visualized.toit
+++ b/tests/mixed-text-visualized.toit
@@ -8,8 +8,6 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/mixed-texture-rotated-visualized.toit b/tests/mixed-texture-rotated-visualized.toit
index b56b79d..4b703df 100644
--- a/tests/mixed-texture-rotated-visualized.toit
+++ b/tests/mixed-texture-rotated-visualized.toit
@@ -8,7 +8,6 @@
 
 import expect show *
 import pixel-display show *
-import pixel-display.element show *
 import .png-visualizer
 
 main args:
diff --git a/tests/mixed-texture-visualized.toit b/tests/mixed-texture-visualized.toit
index e337482..095462e 100644
--- a/tests/mixed-texture-visualized.toit
+++ b/tests/mixed-texture-visualized.toit
@@ -6,8 +6,6 @@
 
 import expect show *
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/rounded-gray-window-visualized.toit b/tests/rounded-gray-window-visualized.toit
index 60cf1ed..583b8ea 100644
--- a/tests/rounded-gray-window-visualized.toit
+++ b/tests/rounded-gray-window-visualized.toit
@@ -5,9 +5,7 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/rounded-huge-window-visualized.toit b/tests/rounded-huge-window-visualized.toit
index bbe7c5f..8ee8509 100644
--- a/tests/rounded-huge-window-visualized.toit
+++ b/tests/rounded-huge-window-visualized.toit
@@ -7,9 +7,7 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/rounded-several-window-visualized.toit b/tests/rounded-several-window-visualized.toit
index dc60faf..1fae3a5 100644
--- a/tests/rounded-several-window-visualized.toit
+++ b/tests/rounded-several-window-visualized.toit
@@ -5,8 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/rounded-three-color-window-visualized.toit b/tests/rounded-three-color-window-visualized.toit
index 61884d4..91bf9d1 100644
--- a/tests/rounded-three-color-window-visualized.toit
+++ b/tests/rounded-three-color-window-visualized.toit
@@ -5,8 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import pixel-display.three-color show BLACK WHITE RED
 import .png-visualizer
 
diff --git a/tests/rounded-two-color-window-visualized.toit b/tests/rounded-two-color-window-visualized.toit
index e716aea..4fd2f97 100644
--- a/tests/rounded-two-color-window-visualized.toit
+++ b/tests/rounded-two-color-window-visualized.toit
@@ -5,8 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import pixel-display.two-color show BLACK WHITE
 import .png-visualizer
 
diff --git a/tests/rounded-window-visualized.toit b/tests/rounded-window-visualized.toit
index 0384aef..fcd2695 100644
--- a/tests/rounded-window-visualized.toit
+++ b/tests/rounded-window-visualized.toit
@@ -5,9 +5,7 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/simple-several-window-visualized.toit b/tests/simple-several-window-visualized.toit
index f8db13f..3f10646 100644
--- a/tests/simple-several-window-visualized.toit
+++ b/tests/simple-several-window-visualized.toit
@@ -5,7 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import .png-visualizer
 
 main args:
diff --git a/tests/simple-three-color-window-visualized.toit b/tests/simple-three-color-window-visualized.toit
index cbdefc0..7e42410 100644
--- a/tests/simple-three-color-window-visualized.toit
+++ b/tests/simple-three-color-window-visualized.toit
@@ -5,7 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.three-color show BLACK WHITE RED
 import .png-visualizer
 
diff --git a/tests/simple-two-color-window-visualized.toit b/tests/simple-two-color-window-visualized.toit
index 3ebdc89..f636f1a 100644
--- a/tests/simple-two-color-window-visualized.toit
+++ b/tests/simple-two-color-window-visualized.toit
@@ -5,7 +5,6 @@
 import bitmap show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.two-color show BLACK WHITE
 import .png-visualizer
 
diff --git a/tests/slider-rotated-visualized.toit b/tests/slider-rotated-visualized.toit
index c70d36a..0e2b9cf 100644
--- a/tests/slider-rotated-visualized.toit
+++ b/tests/slider-rotated-visualized.toit
@@ -9,10 +9,8 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import pixel-display.slider show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/slider-visualized.toit b/tests/slider-visualized.toit
index 61a42e7..34f82d3 100644
--- a/tests/slider-visualized.toit
+++ b/tests/slider-visualized.toit
@@ -9,10 +9,8 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.gradient show *
 import pixel-display.slider show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/style-test.toit b/tests/style-test.toit
index 4ab100d..f6199d8 100644
--- a/tests/style-test.toit
+++ b/tests/style-test.toit
@@ -4,9 +4,7 @@
 
 import expect show *
 
-import pixel-display show Canvas
-import pixel-display.element show Element
-import pixel-display.style show *
+import pixel-display show Canvas Element SolidBorder Style
 
 /// Test that the examples from style.toit are well-formed.
 toit-doc-examples-test:
diff --git a/tests/text-visualized.toit b/tests/text-visualized.toit
index fb995fe..71a2a8c 100644
--- a/tests/text-visualized.toit
+++ b/tests/text-visualized.toit
@@ -9,8 +9,6 @@ import bitmap show *
 import expect show *
 import font show *
 import pixel-display show *
-import pixel-display.element show *
-import pixel-display.style show *
 import .png-visualizer
 
 main args:
diff --git a/tests/three-color-bitmap-2-visualized.toit b/tests/three-color-bitmap-2-visualized.toit
index ab6d418..700e04f 100644
--- a/tests/three-color-bitmap-2-visualized.toit
+++ b/tests/three-color-bitmap-2-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.png show Png
 import pixel-display.three-color show *
 import .png-visualizer
diff --git a/tests/toit-png-tools b/tests/toit-png-tools
index e6ef736..8387669 160000
--- a/tests/toit-png-tools
+++ b/tests/toit-png-tools
@@ -1 +1 @@
-Subproject commit e6ef73621cac0a69823efc7899f06debed7ebc0b
+Subproject commit 8387669efa33a7108c746dcb19dd5ad0ac8f89d0
diff --git a/tests/true-color-portrait-visualized.toit b/tests/true-color-portrait-visualized.toit
index cf65c4b..0974044 100644
--- a/tests/true-color-portrait-visualized.toit
+++ b/tests/true-color-portrait-visualized.toit
@@ -5,7 +5,6 @@
 import expect show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.true-color show *
 import .png-visualizer
 
diff --git a/tests/true-color-visualized.toit b/tests/true-color-visualized.toit
index e9cca35..c6da452 100644
--- a/tests/true-color-visualized.toit
+++ b/tests/true-color-visualized.toit
@@ -5,7 +5,6 @@
 import expect show *
 import font show Font
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.true-color show *
 import .png-visualizer
 
diff --git a/tests/two-color-bitmap-2-visualized.toit b/tests/two-color-bitmap-2-visualized.toit
index 1e559d2..d5dc4f1 100644
--- a/tests/two-color-bitmap-2-visualized.toit
+++ b/tests/two-color-bitmap-2-visualized.toit
@@ -10,7 +10,6 @@ import font
 
 import host.file
 import pixel-display show *
-import pixel-display.element show *
 import pixel-display.png show Png
 import pixel-display.two-color show WHITE BLACK
 import .png-visualizer