diff --git a/Applications/About/Makefile b/Applications/About/Makefile
index cb2e9db1671..928c8c530cb 100755
--- a/Applications/About/Makefile
+++ b/Applications/About/Makefile
@@ -3,7 +3,7 @@ OBJS = \
 
 PROGRAM = About
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 DEFINES += -DGIT_COMMIT=\"`git rev-parse --short HEAD`\" -DGIT_BRANCH=\"`git rev-parse --abbrev-ref HEAD`\" -DGIT_CHANGES=\"`git diff-index --quiet HEAD -- && echo "tracked"|| echo "untracked"`\"
 
diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile
index 9e9a6d94858..12f28553cbd 100755
--- a/Applications/Browser/Makefile
+++ b/Applications/Browser/Makefile
@@ -4,7 +4,7 @@ OBJS = \
 
 PROGRAM = Browser
 
-LIB_DEPS = GUI HTML Draw IPC Protocol Core
+LIB_DEPS = GUI HTML Gfx IPC Protocol Core
 
 main.cpp: ../../Libraries/LibHTML/CSS/PropertyID.h
 ../../Libraries/LibHTML/CSS/PropertyID.h:
diff --git a/Applications/Calculator/Makefile b/Applications/Calculator/Makefile
index 59827aed5e3..05ab47eb2d5 100644
--- a/Applications/Calculator/Makefile
+++ b/Applications/Calculator/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = Calculator
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/Calculator/main.cpp b/Applications/Calculator/main.cpp
index 7f19003c8ca..f12d416a8ac 100644
--- a/Applications/Calculator/main.cpp
+++ b/Applications/Calculator/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "CalculatorWidget.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/ChanViewer/Makefile b/Applications/ChanViewer/Makefile
index 45affe18eaf..9b2eefcc285 100755
--- a/Applications/ChanViewer/Makefile
+++ b/Applications/ChanViewer/Makefile
@@ -5,6 +5,6 @@ OBJS = \
 
 PROGRAM = ChanViewer
 
-LIB_DEPS = GUI Draw IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/ChanViewer/main.cpp b/Applications/ChanViewer/main.cpp
index b8ded65910b..3013fe1d0ff 100644
--- a/Applications/ChanViewer/main.cpp
+++ b/Applications/ChanViewer/main.cpp
@@ -26,7 +26,7 @@
 
 #include "BoardListModel.h"
 #include "ThreadCatalogModel.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/DisplayProperties/DisplayProperties.cpp b/Applications/DisplayProperties/DisplayProperties.cpp
index 57d5639d71e..1a10013a958 100644
--- a/Applications/DisplayProperties/DisplayProperties.cpp
+++ b/Applications/DisplayProperties/DisplayProperties.cpp
@@ -28,7 +28,7 @@
 #include "ItemListModel.h"
 #include <AK/StringBuilder.h>
 #include <LibCore/CDirIterator.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
diff --git a/Applications/DisplayProperties/DisplayProperties.h b/Applications/DisplayProperties/DisplayProperties.h
index 0b678ee7d30..3f1d0649a65 100644
--- a/Applications/DisplayProperties/DisplayProperties.h
+++ b/Applications/DisplayProperties/DisplayProperties.h
@@ -30,8 +30,8 @@
 #include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibCore/CConfigFile.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/Size.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Size.h>
 #include <LibGUI/GWidget.h>
 #include <LibGUI/GLabel.h>
 
diff --git a/Applications/DisplayProperties/Makefile b/Applications/DisplayProperties/Makefile
index ff79479d914..1492cbda6c0 100644
--- a/Applications/DisplayProperties/Makefile
+++ b/Applications/DisplayProperties/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = DisplayProperties
 
-LIB_DEPS = GUI Draw IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/DisplayProperties/main.cpp b/Applications/DisplayProperties/main.cpp
index 3dea4c6424a..cb765bbbd20 100644
--- a/Applications/DisplayProperties/main.cpp
+++ b/Applications/DisplayProperties/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "DisplayProperties.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile
index aeb46376d30..0b4fd8793d0 100644
--- a/Applications/FileManager/Makefile
+++ b/Applications/FileManager/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = FileManager
 
-LIB_DEPS = GUI Draw IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp
index 328ad1df1ff..15758bf6a26 100644
--- a/Applications/FileManager/main.cpp
+++ b/Applications/FileManager/main.cpp
@@ -31,7 +31,7 @@
 #include <AK/StringBuilder.h>
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CUserInfo.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp
index f79b78f4aea..28973ed860a 100644
--- a/Applications/FontEditor/GlyphMapWidget.cpp
+++ b/Applications/FontEditor/GlyphMapWidget.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "GlyphMapWidget.h"
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 
 GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile
index e1e2904d7b4..af40646a998 100644
--- a/Applications/FontEditor/Makefile
+++ b/Applications/FontEditor/Makefile
@@ -6,7 +6,7 @@ OBJS = \
 
 PROGRAM = FontEditor
 
-LIB_DEPS = GUI Draw Core IPC
+LIB_DEPS = GUI Gfx Core IPC
 
 FontEditor.cpp: UI_FontEditorBottom.h
 
diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp
index a6fb0974554..91bbfd2330a 100644
--- a/Applications/FontEditor/main.cpp
+++ b/Applications/FontEditor/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "FontEditor.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/Help/Makefile b/Applications/Help/Makefile
index 0dd85636662..c6e49232965 100644
--- a/Applications/Help/Makefile
+++ b/Applications/Help/Makefile
@@ -7,6 +7,6 @@ OBJS = \
 
 PROGRAM = Help
 
-LIB_DEPS = GUI HTML Draw Markdown IPC Protocol Thread Pthread Core
+LIB_DEPS = GUI HTML Gfx Markdown IPC Protocol Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/Help/ManualModel.cpp b/Applications/Help/ManualModel.cpp
index 302228106c3..3ed77de1a7b 100644
--- a/Applications/Help/ManualModel.cpp
+++ b/Applications/Help/ManualModel.cpp
@@ -28,7 +28,7 @@
 #include "ManualNode.h"
 #include "ManualPageNode.h"
 #include "ManualSectionNode.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 
 static ManualSectionNode s_sections[] = {
     { "1", "Command-line programs" },
diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp
index e22f8f03e91..b1663a147a2 100644
--- a/Applications/Help/main.cpp
+++ b/Applications/Help/main.cpp
@@ -27,7 +27,7 @@
 #include "History.h"
 #include "ManualModel.h"
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/HexEditor/HexEditor.cpp b/Applications/HexEditor/HexEditor.cpp
index 310187e9fd3..55e920f0962 100644
--- a/Applications/HexEditor/HexEditor.cpp
+++ b/Applications/HexEditor/HexEditor.cpp
@@ -27,7 +27,7 @@
 #include "HexEditor.h"
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GClipboard.h>
 #include <LibGUI/GFontDatabase.h>
diff --git a/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h
index 82fb591a43a..05186ab577d 100644
--- a/Applications/HexEditor/HexEditor.h
+++ b/Applications/HexEditor/HexEditor.h
@@ -31,7 +31,7 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/StdLibExtras.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GScrollableWidget.h>
 
 class HexEditor : public GUI::ScrollableWidget {
diff --git a/Applications/HexEditor/HexEditorWidget.cpp b/Applications/HexEditor/HexEditorWidget.cpp
index e765e3aac18..538ad6bd404 100644
--- a/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Applications/HexEditor/HexEditorWidget.cpp
@@ -28,7 +28,7 @@
 #include <AK/Optional.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GBoxLayout.h>
diff --git a/Applications/HexEditor/Makefile b/Applications/HexEditor/Makefile
index 690ee576f52..8231655955c 100644
--- a/Applications/HexEditor/Makefile
+++ b/Applications/HexEditor/Makefile
@@ -5,6 +5,6 @@ OBJS = \
 
 PROGRAM = HexEditor
 
-LIB_DEPS = GUI Draw IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/HexEditor/main.cpp b/Applications/HexEditor/main.cpp
index f877cdac3d5..f5d1d597941 100644
--- a/Applications/HexEditor/main.cpp
+++ b/Applications/HexEditor/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "HexEditorWidget.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)
diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp
index ef4e8445ad5..46ea2cdc702 100644
--- a/Applications/IRCClient/IRCAppWindow.cpp
+++ b/Applications/IRCClient/IRCAppWindow.cpp
@@ -28,7 +28,7 @@
 #include "IRCChannel.h"
 #include "IRCWindow.h"
 #include "IRCWindowListModel.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h
index 886646f0027..d1c7c54041f 100644
--- a/Applications/IRCClient/IRCLogBuffer.h
+++ b/Applications/IRCClient/IRCLogBuffer.h
@@ -29,7 +29,7 @@
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
 #include <AK/String.h>
-#include <LibDraw/Color.h>
+#include <LibGfx/Color.h>
 #include <LibHTML/DOM/Document.h>
 
 class IRCLogBuffer : public RefCounted<IRCLogBuffer> {
diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile
index 6a1fb3f612d..afe6db9b86b 100644
--- a/Applications/IRCClient/Makefile
+++ b/Applications/IRCClient/Makefile
@@ -11,6 +11,6 @@ OBJS = \
 
 PROGRAM = IRCClient
 
-LIB_DEPS = GUI HTML Draw Protocol IPC Thread Pthread Core
+LIB_DEPS = GUI HTML Gfx Protocol IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PaintBrush/BucketTool.cpp
index 135bbd58c18..796dd05b576 100644
--- a/Applications/PaintBrush/BucketTool.cpp
+++ b/Applications/PaintBrush/BucketTool.cpp
@@ -29,7 +29,7 @@
 #include <AK/Queue.h>
 #include <AK/SinglyLinkedList.h>
 #include <LibGUI/GPainter.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <stdio.h>
 
 BucketTool::BucketTool()
diff --git a/Applications/PaintBrush/EllipseTool.cpp b/Applications/PaintBrush/EllipseTool.cpp
index 3563fba2a7e..77179826c05 100644
--- a/Applications/PaintBrush/EllipseTool.cpp
+++ b/Applications/PaintBrush/EllipseTool.cpp
@@ -26,7 +26,7 @@
 
 #include "EllipseTool.h"
 #include "PaintableWidget.h"
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GPainter.h>
diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PaintBrush/EllipseTool.h
index a55b8eb911c..b1ff1adabc5 100644
--- a/Applications/PaintBrush/EllipseTool.h
+++ b/Applications/PaintBrush/EllipseTool.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 #include <LibGUI/GActionGroup.h>
 
 namespace GUI {
diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PaintBrush/EraseTool.h
index 89ebbbc047f..5e68b33978d 100644
--- a/Applications/PaintBrush/EraseTool.h
+++ b/Applications/PaintBrush/EraseTool.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 #include <LibGUI/GActionGroup.h>
 
 namespace GUI {
diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PaintBrush/LineTool.h
index 42f244b29ec..8a1ffdec6c5 100644
--- a/Applications/PaintBrush/LineTool.h
+++ b/Applications/PaintBrush/LineTool.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 #include <LibGUI/GActionGroup.h>
 
 namespace GUI {
diff --git a/Applications/PaintBrush/Makefile b/Applications/PaintBrush/Makefile
index 9eac7692672..9a055bd2c1b 100644
--- a/Applications/PaintBrush/Makefile
+++ b/Applications/PaintBrush/Makefile
@@ -15,6 +15,6 @@ OBJS = \
 
 PROGRAM = PaintBrush
 
-LIB_DEPS = GUI Draw IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/PaintBrush/PaintableWidget.cpp b/Applications/PaintBrush/PaintableWidget.cpp
index a423b0e9d0a..3b06c514a01 100644
--- a/Applications/PaintBrush/PaintableWidget.cpp
+++ b/Applications/PaintBrush/PaintableWidget.cpp
@@ -26,8 +26,8 @@
 
 #include "PaintableWidget.h"
 #include "Tool.h"
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 
 static PaintableWidget* s_the;
diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PaintBrush/PenTool.h
index 52c1f17257a..0ed54a9319f 100644
--- a/Applications/PaintBrush/PenTool.h
+++ b/Applications/PaintBrush/PenTool.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 #include <LibGUI/GActionGroup.h>
 
 namespace GUI {
diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PaintBrush/PickerTool.cpp
index 1eccbf97002..b76eadb52af 100644
--- a/Applications/PaintBrush/PickerTool.cpp
+++ b/Applications/PaintBrush/PickerTool.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "PickerTool.h"
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 PickerTool::PickerTool()
 {
diff --git a/Applications/PaintBrush/RectangleTool.cpp b/Applications/PaintBrush/RectangleTool.cpp
index d3afc1c6f06..070ca6be845 100644
--- a/Applications/PaintBrush/RectangleTool.cpp
+++ b/Applications/PaintBrush/RectangleTool.cpp
@@ -26,7 +26,7 @@
 
 #include "RectangleTool.h"
 #include "PaintableWidget.h"
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GPainter.h>
diff --git a/Applications/PaintBrush/RectangleTool.h b/Applications/PaintBrush/RectangleTool.h
index 171c3762417..1782c592b00 100644
--- a/Applications/PaintBrush/RectangleTool.h
+++ b/Applications/PaintBrush/RectangleTool.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Tool.h"
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 
 namespace GUI {
 class Menu;
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PaintBrush/SprayTool.cpp
index 69083cd1fad..ce1d89d2f77 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PaintBrush/SprayTool.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <stdio.h>
 #include <LibM/math.h>
 
diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PaintBrush/ToolboxWidget.cpp
index cf13fa02968..358781e6a0a 100644
--- a/Applications/PaintBrush/ToolboxWidget.cpp
+++ b/Applications/PaintBrush/ToolboxWidget.cpp
@@ -34,7 +34,7 @@
 #include "PickerTool.h"
 #include "RectangleTool.h"
 #include "SprayTool.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
 
diff --git a/Applications/PaintBrush/main.cpp b/Applications/PaintBrush/main.cpp
index bf8401a5dfc..996d8ae3536 100644
--- a/Applications/PaintBrush/main.cpp
+++ b/Applications/PaintBrush/main.cpp
@@ -27,7 +27,7 @@
 #include "PaintableWidget.h"
 #include "PaletteWidget.h"
 #include "ToolboxWidget.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/Piano/Makefile b/Applications/Piano/Makefile
index 718820b2118..62f3be225d0 100644
--- a/Applications/Piano/Makefile
+++ b/Applications/Piano/Makefile
@@ -9,6 +9,6 @@ OBJS = \
 
 PROGRAM = Piano
 
-LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/Piano/Music.h b/Applications/Piano/Music.h
index 858edd45d25..cdd787cce83 100644
--- a/Applications/Piano/Music.h
+++ b/Applications/Piano/Music.h
@@ -28,7 +28,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <LibDraw/Color.h>
+#include <LibGfx/Color.h>
 
 namespace Music {
 
diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp
index 25ae0cc8179..a01e1141f58 100644
--- a/Applications/Piano/main.cpp
+++ b/Applications/Piano/main.cpp
@@ -29,7 +29,7 @@
 #include "MainWidget.h"
 #include <LibAudio/AClientConnection.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/QuickShow/Makefile b/Applications/QuickShow/Makefile
index 9d27bc44f22..c77b2eade3c 100644
--- a/Applications/QuickShow/Makefile
+++ b/Applications/QuickShow/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = QuickShow
 
-LIB_DEPS = GUI Draw Protocol IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx Protocol IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/QuickShow/QSWidget.cpp b/Applications/QuickShow/QSWidget.cpp
index 02c539513df..db7d204262f 100644
--- a/Applications/QuickShow/QSWidget.cpp
+++ b/Applications/QuickShow/QSWidget.cpp
@@ -26,7 +26,7 @@
 
 #include "QSWidget.h"
 #include <AK/URL.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GMessageBox.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWindow.h>
diff --git a/Applications/QuickShow/main.cpp b/Applications/QuickShow/main.cpp
index 9c2873b82f9..3d472a3e69b 100644
--- a/Applications/QuickShow/main.cpp
+++ b/Applications/QuickShow/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "QSWidget.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
diff --git a/Applications/SoundPlayer/Makefile b/Applications/SoundPlayer/Makefile
index 6c2b4766f58..2d0bc01f508 100644
--- a/Applications/SoundPlayer/Makefile
+++ b/Applications/SoundPlayer/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = SoundPlayer
 
-LIB_DEPS = GUI Draw Audio IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx Audio IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp
index 927727751e3..a26f969d6e0 100644
--- a/Applications/SoundPlayer/main.cpp
+++ b/Applications/SoundPlayer/main.cpp
@@ -26,7 +26,7 @@
 
 #include "SoundPlayerWidget.h"
 #include <LibAudio/AClientConnection.h>
-#include <LibDraw/CharacterBitmap.h>
+#include <LibGfx/CharacterBitmap.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Applications/SystemDialog/Makefile b/Applications/SystemDialog/Makefile
index 6ccf7690e6c..ce009bc506f 100755
--- a/Applications/SystemDialog/Makefile
+++ b/Applications/SystemDialog/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = SystemDialog
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/SystemMonitor/Makefile b/Applications/SystemMonitor/Makefile
index 392ea5b6d64..99cd6f77c02 100644
--- a/Applications/SystemMonitor/Makefile
+++ b/Applications/SystemMonitor/Makefile
@@ -13,6 +13,6 @@ OBJS = \
 
 PROGRAM = SystemMonitor
 
-LIB_DEPS = GUI Draw Protocol PCIDB IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx Protocol PCIDB IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp
index 3fff1dc7cb9..d5705e9927b 100644
--- a/Applications/SystemMonitor/MemoryStatsWidget.cpp
+++ b/Applications/SystemMonitor/MemoryStatsWidget.cpp
@@ -28,7 +28,7 @@
 #include "GraphWidget.h"
 #include <AK/JsonObject.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
diff --git a/Applications/SystemMonitor/main.cpp b/Applications/SystemMonitor/main.cpp
index c6e5ec29888..ddd4a62670c 100644
--- a/Applications/SystemMonitor/main.cpp
+++ b/Applications/SystemMonitor/main.cpp
@@ -35,7 +35,7 @@
 #include "ProcessTableView.h"
 #include "ProcessUnveiledPathsWidget.h"
 #include <LibCore/CTimer.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile
index 9c6463567d9..f40e2a30324 100644
--- a/Applications/Taskbar/Makefile
+++ b/Applications/Taskbar/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = Taskbar
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h
index 38ef9e34098..12a23f5e874 100644
--- a/Applications/Taskbar/WindowList.h
+++ b/Applications/Taskbar/WindowList.h
@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <AK/HashMap.h>
 #include <LibGUI/GButton.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 class Window {
 public:
diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile
index b005a755aa2..5bcea44d5d5 100644
--- a/Applications/Terminal/Makefile
+++ b/Applications/Terminal/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = Terminal
 
-LIB_DEPS = GUI Draw VT IPC Protocol Core
+LIB_DEPS = GUI Gfx VT IPC Protocol Core
 
 include ../../Makefile.common
diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
index 4db3cdfea59..8f9efd317ef 100644
--- a/Applications/Terminal/main.cpp
+++ b/Applications/Terminal/main.cpp
@@ -27,7 +27,7 @@
 #include <Kernel/KeyCode.h>
 #include <LibCore/CArgsParser.h>
 #include <LibCore/CUserInfo.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile
index 6a1b53bc443..10d87dff0a5 100755
--- a/Applications/TextEditor/Makefile
+++ b/Applications/TextEditor/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = TextEditor
 
-LIB_DEPS = GUI Draw VT IPC Thread Pthread Core
+LIB_DEPS = GUI Gfx VT IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp
index 45ae429218d..a90ae23083e 100644
--- a/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Applications/TextEditor/TextEditorWidget.cpp
@@ -29,7 +29,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/URL.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GBoxLayout.h>
diff --git a/Applications/TextEditor/main.cpp b/Applications/TextEditor/main.cpp
index 6f7f94b0559..8eb1f658673 100644
--- a/Applications/TextEditor/main.cpp
+++ b/Applications/TextEditor/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "TextEditorWidget.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)
diff --git a/Applications/Welcome/Makefile b/Applications/Welcome/Makefile
index 7299b09e5b6..0ad7d068204 100644
--- a/Applications/Welcome/Makefile
+++ b/Applications/Welcome/Makefile
@@ -5,7 +5,7 @@ OBJS = \
 
 PROGRAM = Welcome
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 .SUFFIXES: .png
 %.png.o: %.png
diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp
index 97c687fdf14..c28f1858237 100644
--- a/Applications/Welcome/TextWidget.cpp
+++ b/Applications/Welcome/TextWidget.cpp
@@ -28,7 +28,7 @@
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 
 TextWidget::TextWidget(GUI::Widget* parent)
diff --git a/Applications/Welcome/TextWidget.h b/Applications/Welcome/TextWidget.h
index a8876638b7a..4eb5bad2a61 100644
--- a/Applications/Welcome/TextWidget.h
+++ b/Applications/Welcome/TextWidget.h
@@ -28,7 +28,7 @@
 
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GFrame.h>
 
 class TextWidget : public GUI::Frame {
diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp
index 47231ee1a0c..624a3f0e4ca 100644
--- a/Applications/Welcome/main.cpp
+++ b/Applications/Welcome/main.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
diff --git a/Demos/Fire/Fire.cpp b/Demos/Fire/Fire.cpp
index 659cc4b240c..d9e10f2ac14 100644
--- a/Demos/Fire/Fire.cpp
+++ b/Demos/Fire/Fire.cpp
@@ -42,8 +42,8 @@
  *  [ ] handle fire bitmap edges better
 */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
diff --git a/Demos/Fire/Makefile b/Demos/Fire/Makefile
index 122be1ba317..681ded21c96 100644
--- a/Demos/Fire/Makefile
+++ b/Demos/Fire/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = Fire
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
diff --git a/Demos/HelloWorld/Makefile b/Demos/HelloWorld/Makefile
index 41831f89159..30d76744dc0 100644
--- a/Demos/HelloWorld/Makefile
+++ b/Demos/HelloWorld/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = HelloWorld
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile
index fd031fa4e1d..1bc418efcaa 100644
--- a/Demos/HelloWorld2/Makefile
+++ b/Demos/HelloWorld2/Makefile
@@ -3,7 +3,7 @@ OBJS = \
 
 PROGRAM = HelloWorld2
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 main.cpp: UI_HelloWorld2.h
 
diff --git a/Demos/WidgetGallery/Makefile b/Demos/WidgetGallery/Makefile
index 71e40a40b49..3e3b827187a 100644
--- a/Demos/WidgetGallery/Makefile
+++ b/Demos/WidgetGallery/Makefile
@@ -3,6 +3,6 @@ OBJS = \
 
 PROGRAM = WidgetGallery
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
diff --git a/DevTools/HackStudio/CursorTool.h b/DevTools/HackStudio/CursorTool.h
index b001030dd96..7fc8368c3d5 100644
--- a/DevTools/HackStudio/CursorTool.h
+++ b/DevTools/HackStudio/CursorTool.h
@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 #include <AK/HashMap.h>
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 
 namespace GUI {
 class Widget;
diff --git a/DevTools/HackStudio/Makefile b/DevTools/HackStudio/Makefile
index 4d902305df4..144419e524c 100644
--- a/DevTools/HackStudio/Makefile
+++ b/DevTools/HackStudio/Makefile
@@ -18,6 +18,6 @@ OBJS = \
 
 PROGRAM = HackStudio
 
-LIB_DEPS = GUI HTML VT Protocol Markdown Draw IPC Thread Pthread Core
+LIB_DEPS = GUI HTML VT Protocol Markdown Gfx IPC Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/DevTools/IPCCompiler/main.cpp b/DevTools/IPCCompiler/main.cpp
index 2b1995c941a..c23c8ee1a3c 100644
--- a/DevTools/IPCCompiler/main.cpp
+++ b/DevTools/IPCCompiler/main.cpp
@@ -225,8 +225,8 @@ int main(int argc, char** argv)
     dbg() << "#pragma once";
     dbg() << "#include <AK/BufferStream.h>";
     dbg() << "#include <AK/OwnPtr.h>";
-    dbg() << "#include <LibDraw/Color.h>";
-    dbg() << "#include <LibDraw/Rect.h>";
+    dbg() << "#include <LibGfx/Color.h>";
+    dbg() << "#include <LibGfx/Rect.h>";
     dbg() << "#include <LibIPC/IEncoder.h>";
     dbg() << "#include <LibIPC/IEndpoint.h>";
     dbg() << "#include <LibIPC/IMessage.h>";
diff --git a/DevTools/Inspector/Makefile b/DevTools/Inspector/Makefile
index f2afb507b20..80d6c585638 100644
--- a/DevTools/Inspector/Makefile
+++ b/DevTools/Inspector/Makefile
@@ -7,6 +7,6 @@ OBJS = \
 
 PROGRAM = Inspector
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/DevTools/Inspector/RemoteObjectGraphModel.cpp b/DevTools/Inspector/RemoteObjectGraphModel.cpp
index 3321183b981..1dd481d25c0 100644
--- a/DevTools/Inspector/RemoteObjectGraphModel.cpp
+++ b/DevTools/Inspector/RemoteObjectGraphModel.cpp
@@ -29,7 +29,7 @@
 #include "RemoteProcess.h"
 #include <AK/JsonObject.h>
 #include <AK/JsonValue.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <stdio.h>
 
diff --git a/DevTools/ProfileViewer/Makefile b/DevTools/ProfileViewer/Makefile
index 01daf3d50a6..745fa429dda 100644
--- a/DevTools/ProfileViewer/Makefile
+++ b/DevTools/ProfileViewer/Makefile
@@ -6,6 +6,6 @@ OBJS = \
 
 PROGRAM = ProfileViewer
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/DevTools/VisualBuilder/Makefile b/DevTools/VisualBuilder/Makefile
index a29ba982eb3..85350423b0a 100644
--- a/DevTools/VisualBuilder/Makefile
+++ b/DevTools/VisualBuilder/Makefile
@@ -9,6 +9,6 @@ OBJS = \
 
 PROGRAM = VisualBuilder
 
-LIB_DEPS = GUI Draw IPC Core
+LIB_DEPS = GUI Gfx IPC Core
 
 include ../../Makefile.common
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp
index 00fa9d04d71..51e1ea9202f 100644
--- a/DevTools/VisualBuilder/VBForm.cpp
+++ b/DevTools/VisualBuilder/VBForm.cpp
@@ -32,7 +32,7 @@
 #include <AK/JsonObject.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GMenu.h>
diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h
index 48bee7f478f..fd898a75556 100644
--- a/DevTools/VisualBuilder/VBWidget.h
+++ b/DevTools/VisualBuilder/VBWidget.h
@@ -33,7 +33,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/RefCounted.h>
 #include <AK/Weakable.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GWidget.h>
 
 namespace GUI {
diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
index 8acb441694b..77ec5cc6365 100644
--- a/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
+++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.cpp
@@ -27,7 +27,7 @@
 #include "VBWidgetPropertyModel.h"
 #include "VBProperty.h"
 #include "VBWidget.h"
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 
 VBWidgetPropertyModel::VBWidgetPropertyModel(VBWidget& widget)
     : m_widget(widget)
diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp
index 421de868afe..9cedadc7610 100644
--- a/DevTools/VisualBuilder/main.cpp
+++ b/DevTools/VisualBuilder/main.cpp
@@ -28,7 +28,7 @@
 #include "VBPropertiesWindow.h"
 #include "VBWidget.h"
 #include "VBWidgetPropertyModel.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Games/Minesweeper/Makefile b/Games/Minesweeper/Makefile
index d0d0afe6319..ec87fb5e82b 100644
--- a/Games/Minesweeper/Makefile
+++ b/Games/Minesweeper/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = Minesweeper
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp
index 657be40720a..c159fa9bd19 100644
--- a/Games/Minesweeper/main.cpp
+++ b/Games/Minesweeper/main.cpp
@@ -26,7 +26,7 @@
 
 #include "Field.h"
 #include <LibCore/CConfigFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Games/Snake/Makefile b/Games/Snake/Makefile
index cff8a85b271..353b28f433e 100644
--- a/Games/Snake/Makefile
+++ b/Games/Snake/Makefile
@@ -4,6 +4,6 @@ OBJS = \
 
 PROGRAM = Snake
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
index 2eed90cf6c2..21aa51fc0af 100644
--- a/Games/Snake/SnakeGame.cpp
+++ b/Games/Snake/SnakeGame.cpp
@@ -27,7 +27,7 @@
 #include "SnakeGame.h"
 #include <LibGUI/GFontDatabase.h>
 #include <LibGUI/GPainter.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/Games/Snake/main.cpp b/Games/Snake/main.cpp
index 191c12ff9b0..42df1d9799e 100644
--- a/Games/Snake/main.cpp
+++ b/Games/Snake/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "SnakeGame.h"
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/CConfigFile.h
index 15ff959b6fa..6a71ff9b88b 100644
--- a/Libraries/LibCore/CConfigFile.h
+++ b/Libraries/LibCore/CConfigFile.h
@@ -31,7 +31,7 @@
 #include <AK/RefPtr.h>
 #include <AK/String.h>
 #include <AK/Vector.h>
-#include <LibDraw/Color.h>
+#include <LibGfx/Color.h>
 
 namespace Core {
 
diff --git a/Libraries/LibGUI/GAbstractButton.cpp b/Libraries/LibGUI/GAbstractButton.cpp
index aa15645fb32..a913e80a0a1 100644
--- a/Libraries/LibGUI/GAbstractButton.cpp
+++ b/Libraries/LibGUI/GAbstractButton.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAbstractButton.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Libraries/LibGUI/GAbstractButton.h b/Libraries/LibGUI/GAbstractButton.h
index bc9abc829ec..f87c2e1c097 100644
--- a/Libraries/LibGUI/GAbstractButton.h
+++ b/Libraries/LibGUI/GAbstractButton.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibCore/CTimer.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GWidget.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/GAbstractTableView.cpp b/Libraries/LibGUI/GAbstractTableView.cpp
index 3b29e49e486..fdaa15b73e4 100644
--- a/Libraries/LibGUI/GAbstractTableView.cpp
+++ b/Libraries/LibGUI/GAbstractTableView.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAbstractTableView.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h
index 20899bb7607..59041077899 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/GAction.h
@@ -34,7 +34,7 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <AK/Weakable.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GShortcut.h>
 #include <LibGUI/GWindow.h>
 
diff --git a/Libraries/LibGUI/GApplication.cpp b/Libraries/LibGUI/GApplication.cpp
index 2dcb83f4aca..90c0796a6fd 100644
--- a/Libraries/LibGUI/GApplication.cpp
+++ b/Libraries/LibGUI/GApplication.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GDesktop.h>
diff --git a/Libraries/LibGUI/GApplication.h b/Libraries/LibGUI/GApplication.h
index 0c832f71cd3..e26b0c4c636 100644
--- a/Libraries/LibGUI/GApplication.h
+++ b/Libraries/LibGUI/GApplication.h
@@ -29,7 +29,7 @@
 #include <AK/Badge.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GShortcut.h>
 
 namespace AK {
diff --git a/Libraries/LibGUI/GButton.cpp b/Libraries/LibGUI/GButton.cpp
index 0629c3131fb..58c4cd1ff6e 100644
--- a/Libraries/LibGUI/GButton.cpp
+++ b/Libraries/LibGUI/GButton.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
 #include <LibGUI/GButton.h>
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h
index 3c0b06e55bb..57cb41fa7e8 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/GButton.h
@@ -28,9 +28,9 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/StylePainter.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/StylePainter.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GAbstractButton.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/GCheckBox.cpp b/Libraries/LibGUI/GCheckBox.cpp
index 18c436cb324..085bfa9b791 100644
--- a/Libraries/LibGUI/GCheckBox.cpp
+++ b/Libraries/LibGUI/GCheckBox.cpp
@@ -25,9 +25,9 @@
  */
 
 #include <Kernel/KeyCode.h>
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GCheckBox.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Libraries/LibGUI/GColumnsView.cpp b/Libraries/LibGUI/GColumnsView.cpp
index 62b1e413b03..65ccbaaf507 100644
--- a/Libraries/LibGUI/GColumnsView.cpp
+++ b/Libraries/LibGUI/GColumnsView.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/CharacterBitmap.h>
+#include <LibGfx/CharacterBitmap.h>
 #include <LibGUI/GColumnsView.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h
index a41cbfe5c93..376aa1beda2 100644
--- a/Libraries/LibGUI/GDesktop.h
+++ b/Libraries/LibGUI/GDesktop.h
@@ -29,7 +29,7 @@
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/GDragOperation.cpp b/Libraries/LibGUI/GDragOperation.cpp
index ab9c47c57da..a8b506f0c70 100644
--- a/Libraries/LibGUI/GDragOperation.cpp
+++ b/Libraries/LibGUI/GDragOperation.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GDragOperation.h>
 #include <LibGUI/GWindowServerConnection.h>
 
diff --git a/Libraries/LibGUI/GEvent.h b/Libraries/LibGUI/GEvent.h
index a5a7f87674c..745bb8a4b3c 100644
--- a/Libraries/LibGUI/GEvent.h
+++ b/Libraries/LibGUI/GEvent.h
@@ -28,8 +28,8 @@
 
 #include <Kernel/KeyCode.h>
 #include <LibCore/CEvent.h>
-#include <LibDraw/Point.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Point.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GWindowType.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp
index fa93a1ff964..f329f2d9b6a 100644
--- a/Libraries/LibGUI/GFilePicker.cpp
+++ b/Libraries/LibGUI/GFilePicker.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/FileSystemPath.h>
 #include <AK/Function.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GButton.h>
diff --git a/Libraries/LibGUI/GFileSystemModel.cpp b/Libraries/LibGUI/GFileSystemModel.cpp
index 8e9152b8ca2..9f349e15113 100644
--- a/Libraries/LibGUI/GFileSystemModel.cpp
+++ b/Libraries/LibGUI/GFileSystemModel.cpp
@@ -27,7 +27,7 @@
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/CDirIterator.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GFileSystemModel.h>
 #include <LibGUI/GPainter.h>
 #include <LibThread/BackgroundAction.h>
diff --git a/Libraries/LibGUI/GFontDatabase.cpp b/Libraries/LibGUI/GFontDatabase.cpp
index a048f7b8ebc..b614769d265 100644
--- a/Libraries/LibGUI/GFontDatabase.cpp
+++ b/Libraries/LibGUI/GFontDatabase.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/QuickSort.h>
 #include <LibCore/CDirIterator.h>
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 #include <LibGUI/GFontDatabase.h>
 #include <dirent.h>
 #include <stdio.h>
diff --git a/Libraries/LibGUI/GFrame.cpp b/Libraries/LibGUI/GFrame.cpp
index 19cb35ac9e0..6ab72bd863f 100644
--- a/Libraries/LibGUI/GFrame.cpp
+++ b/Libraries/LibGUI/GFrame.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GFrame.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Libraries/LibGUI/GFrame.h b/Libraries/LibGUI/GFrame.h
index f5cd7a9efee..cfa6bf6c764 100644
--- a/Libraries/LibGUI/GFrame.h
+++ b/Libraries/LibGUI/GFrame.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GWidget.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/GGroupBox.cpp b/Libraries/LibGUI/GGroupBox.cpp
index 24928da0580..e5aeff65848 100644
--- a/Libraries/LibGUI/GGroupBox.cpp
+++ b/Libraries/LibGUI/GGroupBox.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GGroupBox.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Libraries/LibGUI/GIcon.h b/Libraries/LibGUI/GIcon.h
index d7d7bcfb0f7..6199f4c4732 100644
--- a/Libraries/LibGUI/GIcon.h
+++ b/Libraries/LibGUI/GIcon.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/HashMap.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 class GIconImpl : public RefCounted<GIconImpl> {
 public:
diff --git a/Libraries/LibGUI/GItemView.cpp b/Libraries/LibGUI/GItemView.cpp
index 347d4fcc97c..17a4567f2d2 100644
--- a/Libraries/LibGUI/GItemView.cpp
+++ b/Libraries/LibGUI/GItemView.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GDragOperation.h>
 #include <LibGUI/GItemView.h>
 #include <LibGUI/GModel.h>
diff --git a/Libraries/LibGUI/GLabel.cpp b/Libraries/LibGUI/GLabel.cpp
index a3cf44c5284..f0f2cb087fe 100644
--- a/Libraries/LibGUI/GLabel.cpp
+++ b/Libraries/LibGUI/GLabel.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
 
diff --git a/Libraries/LibGUI/GLabel.h b/Libraries/LibGUI/GLabel.h
index 101642bb227..ba6aa4bc83b 100644
--- a/Libraries/LibGUI/GLabel.h
+++ b/Libraries/LibGUI/GLabel.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GFrame.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGUI/GListView.cpp b/Libraries/LibGUI/GListView.cpp
index dba58108dd5..a375a91391c 100644
--- a/Libraries/LibGUI/GListView.cpp
+++ b/Libraries/LibGUI/GListView.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GListView.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/GModel.h
index 19609d8d614..b5c4747ba6d 100644
--- a/Libraries/LibGUI/GModel.h
+++ b/Libraries/LibGUI/GModel.h
@@ -31,7 +31,7 @@
 #include <AK/HashTable.h>
 #include <AK/RefCounted.h>
 #include <AK/String.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GModelIndex.h>
 #include <LibGUI/GVariant.h>
 
diff --git a/Libraries/LibGUI/GPainter.h b/Libraries/LibGUI/GPainter.h
index 70686466f0b..a243e01cf44 100644
--- a/Libraries/LibGUI/GPainter.h
+++ b/Libraries/LibGUI/GPainter.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/Painter.h>
+#include <LibGfx/Painter.h>
 
 namespace GUI {
 
diff --git a/Libraries/LibGUI/GRadioButton.cpp b/Libraries/LibGUI/GRadioButton.cpp
index a0c5538260e..325f72a89da 100644
--- a/Libraries/LibGUI/GRadioButton.cpp
+++ b/Libraries/LibGUI/GRadioButton.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GRadioButton.h>
 
diff --git a/Libraries/LibGUI/GResizeCorner.cpp b/Libraries/LibGUI/GResizeCorner.cpp
index a39b7cb465b..d109fbaec9c 100644
--- a/Libraries/LibGUI/GResizeCorner.cpp
+++ b/Libraries/LibGUI/GResizeCorner.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GResizeCorner.h>
 #include <LibGUI/GWindow.h>
diff --git a/Libraries/LibGUI/GScrollBar.cpp b/Libraries/LibGUI/GScrollBar.cpp
index 503fd3f7f64..8fa8471963c 100644
--- a/Libraries/LibGUI/GScrollBar.cpp
+++ b/Libraries/LibGUI/GScrollBar.cpp
@@ -24,10 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
 
diff --git a/Libraries/LibGUI/GSlider.cpp b/Libraries/LibGUI/GSlider.cpp
index 79f2eef5814..c4fd08344e3 100644
--- a/Libraries/LibGUI/GSlider.cpp
+++ b/Libraries/LibGUI/GSlider.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GSlider.h>
 
diff --git a/Libraries/LibGUI/GSplitter.cpp b/Libraries/LibGUI/GSplitter.cpp
index ae6c02b9679..30d500a3567 100644
--- a/Libraries/LibGUI/GSplitter.cpp
+++ b/Libraries/LibGUI/GSplitter.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GSplitter.h>
 #include <LibGUI/GWindow.h>
diff --git a/Libraries/LibGUI/GStatusBar.cpp b/Libraries/LibGUI/GStatusBar.cpp
index 1345a7ac333..7508f560ad8 100644
--- a/Libraries/LibGUI/GStatusBar.cpp
+++ b/Libraries/LibGUI/GStatusBar.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GLabel.h>
 #include <LibGUI/GPainter.h>
diff --git a/Libraries/LibGUI/GTabWidget.cpp b/Libraries/LibGUI/GTabWidget.cpp
index dab99d112b5..f052e278a85 100644
--- a/Libraries/LibGUI/GTabWidget.cpp
+++ b/Libraries/LibGUI/GTabWidget.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GBoxLayout.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GTabWidget.h>
diff --git a/Libraries/LibGUI/GTableView.cpp b/Libraries/LibGUI/GTableView.cpp
index 403980ae359..f476220d309 100644
--- a/Libraries/LibGUI/GTableView.cpp
+++ b/Libraries/LibGUI/GTableView.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GMenu.h>
 #include <LibGUI/GModel.h>
diff --git a/Libraries/LibGUI/GTextDocument.h b/Libraries/LibGUI/GTextDocument.h
index 47dbac6324c..004939f7f22 100644
--- a/Libraries/LibGUI/GTextDocument.h
+++ b/Libraries/LibGUI/GTextDocument.h
@@ -32,8 +32,8 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/RefCounted.h>
 #include <LibCore/CTimer.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/Font.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Font.h>
 #include <LibGUI/GTextRange.h>
 #include <LibGUI/GUndoStack.h>
 
diff --git a/Libraries/LibGUI/GTextEditor.cpp b/Libraries/LibGUI/GTextEditor.cpp
index aca6fa20fa5..6940404f6e6 100644
--- a/Libraries/LibGUI/GTextEditor.cpp
+++ b/Libraries/LibGUI/GTextEditor.cpp
@@ -27,7 +27,7 @@
 #include <AK/QuickSort.h>
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GClipboard.h>
 #include <LibGUI/GFontDatabase.h>
diff --git a/Libraries/LibGUI/GTextEditor.h b/Libraries/LibGUI/GTextEditor.h
index dad205c28de..eb1099f030f 100644
--- a/Libraries/LibGUI/GTextEditor.h
+++ b/Libraries/LibGUI/GTextEditor.h
@@ -31,7 +31,7 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <LibCore/CTimer.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/TextAlignment.h>
 #include <LibGUI/GScrollableWidget.h>
 #include <LibGUI/GTextDocument.h>
 #include <LibGUI/GTextRange.h>
diff --git a/Libraries/LibGUI/GToolBar.cpp b/Libraries/LibGUI/GToolBar.cpp
index 829d14f7ff3..93046c6ed45 100644
--- a/Libraries/LibGUI/GToolBar.cpp
+++ b/Libraries/LibGUI/GToolBar.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GActionGroup.h>
 #include <LibGUI/GBoxLayout.h>
diff --git a/Libraries/LibGUI/GTreeView.cpp b/Libraries/LibGUI/GTreeView.cpp
index adcd6960b49..cd3f8bf58c0 100644
--- a/Libraries/LibGUI/GTreeView.cpp
+++ b/Libraries/LibGUI/GTreeView.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
 #include <LibGUI/GTreeView.h>
diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h
index 61aad13364e..12f522b4100 100644
--- a/Libraries/LibGUI/GVariant.h
+++ b/Libraries/LibGUI/GVariant.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <AK/String.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GIcon.h>
 
 namespace AK {
diff --git a/Libraries/LibGUI/GWidget.cpp b/Libraries/LibGUI/GWidget.cpp
index 2953c9ac282..025eaaa26fd 100644
--- a/Libraries/LibGUI/GWidget.cpp
+++ b/Libraries/LibGUI/GWidget.cpp
@@ -26,8 +26,8 @@
 
 #include <AK/Assertions.h>
 #include <AK/JsonObject.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GButton.h>
diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/GWidget.h
index ff9edaa03bb..512775ddc11 100644
--- a/Libraries/LibGUI/GWidget.h
+++ b/Libraries/LibGUI/GWidget.h
@@ -31,12 +31,12 @@
 #include <AK/String.h>
 #include <LibCore/CElapsedTimer.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/Orientation.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/Rect.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Orientation.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/Rect.h>
+#include <LibGfx/SystemTheme.h>
 #include <LibGUI/GEvent.h>
 #include <LibGUI/GShortcut.h>
 
diff --git a/Libraries/LibGUI/GWindow.cpp b/Libraries/LibGUI/GWindow.cpp
index 95620d88612..111ffbd4adf 100644
--- a/Libraries/LibGUI/GWindow.cpp
+++ b/Libraries/LibGUI/GWindow.cpp
@@ -28,7 +28,7 @@
 #include <AK/JsonObject.h>
 #include <AK/NeverDestroyed.h>
 #include <AK/SharedBuffer.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GEvent.h>
diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h
index 68c8fd21011..35dd5645ec0 100644
--- a/Libraries/LibGUI/GWindow.h
+++ b/Libraries/LibGUI/GWindow.h
@@ -31,8 +31,8 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GWindowType.h>
 
 namespace GUI {
diff --git a/Libraries/LibGUI/GWindowServerConnection.cpp b/Libraries/LibGUI/GWindowServerConnection.cpp
index c8c4db09750..c659b7f5a5c 100644
--- a/Libraries/LibGUI/GWindowServerConnection.cpp
+++ b/Libraries/LibGUI/GWindowServerConnection.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/SystemTheme.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GClipboard.h>
diff --git a/Libraries/LibDraw/CharacterBitmap.cpp b/Libraries/LibGfx/CharacterBitmap.cpp
similarity index 100%
rename from Libraries/LibDraw/CharacterBitmap.cpp
rename to Libraries/LibGfx/CharacterBitmap.cpp
diff --git a/Libraries/LibDraw/CharacterBitmap.h b/Libraries/LibGfx/CharacterBitmap.h
similarity index 100%
rename from Libraries/LibDraw/CharacterBitmap.h
rename to Libraries/LibGfx/CharacterBitmap.h
diff --git a/Libraries/LibDraw/Color.cpp b/Libraries/LibGfx/Color.cpp
similarity index 99%
rename from Libraries/LibDraw/Color.cpp
rename to Libraries/LibGfx/Color.cpp
index dcfdf90e807..22eb8ecaa53 100644
--- a/Libraries/LibDraw/Color.cpp
+++ b/Libraries/LibGfx/Color.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/Assertions.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/SystemTheme.h>
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/Libraries/LibDraw/Color.h b/Libraries/LibGfx/Color.h
similarity index 100%
rename from Libraries/LibDraw/Color.h
rename to Libraries/LibGfx/Color.h
diff --git a/Libraries/LibDraw/DisjointRectSet.cpp b/Libraries/LibGfx/DisjointRectSet.cpp
similarity index 98%
rename from Libraries/LibDraw/DisjointRectSet.cpp
rename to Libraries/LibGfx/DisjointRectSet.cpp
index af47224f748..68270b983bb 100644
--- a/Libraries/LibDraw/DisjointRectSet.cpp
+++ b/Libraries/LibGfx/DisjointRectSet.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/DisjointRectSet.h>
+#include <LibGfx/DisjointRectSet.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/DisjointRectSet.h b/Libraries/LibGfx/DisjointRectSet.h
similarity index 98%
rename from Libraries/LibDraw/DisjointRectSet.h
rename to Libraries/LibGfx/DisjointRectSet.h
index 9a36abb43e1..538dfc9c4ce 100644
--- a/Libraries/LibDraw/DisjointRectSet.h
+++ b/Libraries/LibGfx/DisjointRectSet.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Vector.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp
similarity index 96%
rename from Libraries/LibDraw/Emoji.cpp
rename to Libraries/LibGfx/Emoji.cpp
index fe8b7e9339c..bb0fc3910ef 100644
--- a/Libraries/LibDraw/Emoji.cpp
+++ b/Libraries/LibGfx/Emoji.cpp
@@ -26,8 +26,8 @@
 
 #include <AK/HashMap.h>
 #include <AK/String.h>
-#include <LibDraw/Emoji.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/Emoji.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Emoji.h b/Libraries/LibGfx/Emoji.h
similarity index 100%
rename from Libraries/LibDraw/Emoji.h
rename to Libraries/LibGfx/Emoji.h
diff --git a/Libraries/LibDraw/FloatPoint.h b/Libraries/LibGfx/FloatPoint.h
similarity index 99%
rename from Libraries/LibDraw/FloatPoint.h
rename to Libraries/LibGfx/FloatPoint.h
index 05f16c7cfc4..03a685dd197 100644
--- a/Libraries/LibDraw/FloatPoint.h
+++ b/Libraries/LibGfx/FloatPoint.h
@@ -28,7 +28,7 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/Orientation.h>
+#include <LibGfx/Orientation.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/FloatRect.h b/Libraries/LibGfx/FloatRect.h
similarity index 98%
rename from Libraries/LibDraw/FloatRect.h
rename to Libraries/LibGfx/FloatRect.h
index 91ec03eee14..4c3779b34d4 100644
--- a/Libraries/LibDraw/FloatRect.h
+++ b/Libraries/LibGfx/FloatRect.h
@@ -28,11 +28,11 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/FloatPoint.h>
-#include <LibDraw/FloatSize.h>
-#include <LibDraw/Orientation.h>
-#include <LibDraw/Rect.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/FloatPoint.h>
+#include <LibGfx/FloatSize.h>
+#include <LibGfx/Orientation.h>
+#include <LibGfx/Rect.h>
+#include <LibGfx/TextAlignment.h>
 #include <math.h>
 
 namespace Gfx {
diff --git a/Libraries/LibDraw/FloatSize.h b/Libraries/LibGfx/FloatSize.h
similarity index 99%
rename from Libraries/LibDraw/FloatSize.h
rename to Libraries/LibGfx/FloatSize.h
index 08376a5fc25..90d41675386 100644
--- a/Libraries/LibDraw/FloatSize.h
+++ b/Libraries/LibGfx/FloatSize.h
@@ -28,7 +28,7 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/Orientation.h>
+#include <LibGfx/Orientation.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Font.cpp b/Libraries/LibGfx/Font.cpp
similarity index 100%
rename from Libraries/LibDraw/Font.cpp
rename to Libraries/LibGfx/Font.cpp
diff --git a/Libraries/LibDraw/Font.h b/Libraries/LibGfx/Font.h
similarity index 99%
rename from Libraries/LibDraw/Font.h
rename to Libraries/LibGfx/Font.h
index b164582e849..07fe58d785e 100644
--- a/Libraries/LibDraw/Font.h
+++ b/Libraries/LibGfx/Font.h
@@ -32,7 +32,7 @@
 #include <AK/String.h>
 #include <AK/Types.h>
 #include <AK/Utf8View.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
similarity index 99%
rename from Libraries/LibDraw/GIFLoader.cpp
rename to Libraries/LibGfx/GIFLoader.cpp
index 2ef4ea59e8c..8ec1a052ee7 100644
--- a/Libraries/LibDraw/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -28,7 +28,7 @@
 #include <AK/ByteBuffer.h>
 #include <AK/FileSystemPath.h>
 #include <AK/NonnullOwnPtrVector.h>
-#include <LibDraw/GIFLoader.h>
+#include <LibGfx/GIFLoader.h>
 #include <stdio.h>
 
 namespace Gfx {
diff --git a/Libraries/LibDraw/GIFLoader.h b/Libraries/LibGfx/GIFLoader.h
similarity index 96%
rename from Libraries/LibDraw/GIFLoader.h
rename to Libraries/LibGfx/GIFLoader.h
index 06be29aa4be..b18eafa0b09 100644
--- a/Libraries/LibDraw/GIFLoader.h
+++ b/Libraries/LibGfx/GIFLoader.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/ImageDecoder.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/GraphicsBitmap.cpp b/Libraries/LibGfx/GraphicsBitmap.cpp
similarity index 98%
rename from Libraries/LibDraw/GraphicsBitmap.cpp
rename to Libraries/LibGfx/GraphicsBitmap.cpp
index 7b5e00dd2b8..d48cfa7d036 100644
--- a/Libraries/LibDraw/GraphicsBitmap.cpp
+++ b/Libraries/LibGfx/GraphicsBitmap.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/MappedFile.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/PNGLoader.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/Libraries/LibDraw/GraphicsBitmap.h b/Libraries/LibGfx/GraphicsBitmap.h
similarity index 100%
rename from Libraries/LibDraw/GraphicsBitmap.h
rename to Libraries/LibGfx/GraphicsBitmap.h
diff --git a/Libraries/LibDraw/ImageDecoder.cpp b/Libraries/LibGfx/ImageDecoder.cpp
similarity index 96%
rename from Libraries/LibDraw/ImageDecoder.cpp
rename to Libraries/LibGfx/ImageDecoder.cpp
index aae0dbfa01b..87a9f79ca14 100644
--- a/Libraries/LibDraw/ImageDecoder.cpp
+++ b/Libraries/LibGfx/ImageDecoder.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/ImageDecoder.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/ImageDecoder.h>
+#include <LibGfx/PNGLoader.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/ImageDecoder.h b/Libraries/LibGfx/ImageDecoder.h
similarity index 98%
rename from Libraries/LibDraw/ImageDecoder.h
rename to Libraries/LibGfx/ImageDecoder.h
index d00a90c4dda..dd3d901173c 100644
--- a/Libraries/LibDraw/ImageDecoder.h
+++ b/Libraries/LibGfx/ImageDecoder.h
@@ -29,7 +29,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <AK/OwnPtr.h>
 #include <AK/RefCounted.h>
-#include <LibDraw/Size.h>
+#include <LibGfx/Size.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Makefile b/Libraries/LibGfx/Makefile
similarity index 72%
rename from Libraries/LibDraw/Makefile
rename to Libraries/LibGfx/Makefile
index a0490675aa9..c7d4da3efc6 100644
--- a/Libraries/LibDraw/Makefile
+++ b/Libraries/LibGfx/Makefile
@@ -14,11 +14,11 @@ OBJS = \
     Palette.o \
     Emoji.o
 
-LIBRARY = libdraw.a
+LIBRARY = libgfx.a
 
 install:
-	mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibDraw/
-	cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/LibDraw/
+	mkdir -p $(SERENITY_BASE_DIR)/Root/usr/include/LibGfx/
+	cp *.h $(SERENITY_BASE_DIR)/Root/usr/include/LibGfx/
 	cp $(LIBRARY) $(SERENITY_BASE_DIR)/Root/usr/lib/
 
 include ../../Makefile.common
diff --git a/Libraries/LibDraw/Orientation.h b/Libraries/LibGfx/Orientation.h
similarity index 100%
rename from Libraries/LibDraw/Orientation.h
rename to Libraries/LibGfx/Orientation.h
diff --git a/Libraries/LibDraw/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
similarity index 99%
rename from Libraries/LibDraw/PNGLoader.cpp
rename to Libraries/LibGfx/PNGLoader.cpp
index 68a9c585b87..f194adde89d 100644
--- a/Libraries/LibDraw/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -28,7 +28,7 @@
 #include <AK/MappedFile.h>
 #include <AK/NetworkOrdered.h>
 #include <LibCore/puff.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <fcntl.h>
 #include <serenity.h>
 #include <stdio.h>
diff --git a/Libraries/LibDraw/PNGLoader.h b/Libraries/LibGfx/PNGLoader.h
similarity index 96%
rename from Libraries/LibDraw/PNGLoader.h
rename to Libraries/LibGfx/PNGLoader.h
index c3d5f8e3f89..c5217d52768 100644
--- a/Libraries/LibDraw/PNGLoader.h
+++ b/Libraries/LibGfx/PNGLoader.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/ImageDecoder.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Painter.cpp b/Libraries/LibGfx/Painter.cpp
similarity index 99%
rename from Libraries/LibDraw/Painter.cpp
rename to Libraries/LibGfx/Painter.cpp
index 4cc8bbc42dc..00c1e9d050b 100644
--- a/Libraries/LibDraw/Painter.cpp
+++ b/Libraries/LibGfx/Painter.cpp
@@ -32,7 +32,7 @@
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
 #include <AK/Utf8View.h>
-#include <LibDraw/CharacterBitmap.h>
+#include <LibGfx/CharacterBitmap.h>
 #include <math.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Libraries/LibDraw/Painter.h b/Libraries/LibGfx/Painter.h
similarity index 98%
rename from Libraries/LibDraw/Painter.h
rename to Libraries/LibGfx/Painter.h
index 638ef9d30e1..7e8cfb838f2 100644
--- a/Libraries/LibDraw/Painter.h
+++ b/Libraries/LibGfx/Painter.h
@@ -32,8 +32,8 @@
 #include "Size.h"
 #include <AK/String.h>
 #include <AK/Utf8View.h>
-#include <LibDraw/TextAlignment.h>
-#include <LibDraw/TextElision.h>
+#include <LibGfx/TextAlignment.h>
+#include <LibGfx/TextElision.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Palette.cpp b/Libraries/LibGfx/Palette.cpp
similarity index 98%
rename from Libraries/LibDraw/Palette.cpp
rename to Libraries/LibGfx/Palette.cpp
index 217c1c9bcfe..928387cb971 100644
--- a/Libraries/LibDraw/Palette.cpp
+++ b/Libraries/LibGfx/Palette.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Palette.h b/Libraries/LibGfx/Palette.h
similarity index 99%
rename from Libraries/LibDraw/Palette.h
rename to Libraries/LibGfx/Palette.h
index 8e05f32b5ae..76c7db28266 100644
--- a/Libraries/LibDraw/Palette.h
+++ b/Libraries/LibGfx/Palette.h
@@ -28,7 +28,7 @@
 
 #include <AK/Badge.h>
 #include <AK/Noncopyable.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/SystemTheme.h>
 
 namespace GUI {
 class Application;
diff --git a/Libraries/LibDraw/Point.h b/Libraries/LibGfx/Point.h
similarity index 99%
rename from Libraries/LibDraw/Point.h
rename to Libraries/LibGfx/Point.h
index 8bdd76efbde..1c52b62cfa2 100644
--- a/Libraries/LibDraw/Point.h
+++ b/Libraries/LibGfx/Point.h
@@ -28,7 +28,7 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/Orientation.h>
+#include <LibGfx/Orientation.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Rect.cpp b/Libraries/LibGfx/Rect.cpp
similarity index 100%
rename from Libraries/LibDraw/Rect.cpp
rename to Libraries/LibGfx/Rect.cpp
diff --git a/Libraries/LibDraw/Rect.h b/Libraries/LibGfx/Rect.h
similarity index 98%
rename from Libraries/LibDraw/Rect.h
rename to Libraries/LibGfx/Rect.h
index 3e9a1d8bfcd..29fbba03fa9 100644
--- a/Libraries/LibDraw/Rect.h
+++ b/Libraries/LibGfx/Rect.h
@@ -28,10 +28,10 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/Orientation.h>
-#include <LibDraw/Point.h>
-#include <LibDraw/Size.h>
-#include <LibDraw/TextAlignment.h>
+#include <LibGfx/Orientation.h>
+#include <LibGfx/Point.h>
+#include <LibGfx/Size.h>
+#include <LibGfx/TextAlignment.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/Size.h b/Libraries/LibGfx/Size.h
similarity index 99%
rename from Libraries/LibDraw/Size.h
rename to Libraries/LibGfx/Size.h
index bc027617cad..1430bfb903b 100644
--- a/Libraries/LibDraw/Size.h
+++ b/Libraries/LibGfx/Size.h
@@ -28,7 +28,7 @@
 
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibDraw/Orientation.h>
+#include <LibGfx/Orientation.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/StylePainter.cpp b/Libraries/LibGfx/StylePainter.cpp
similarity index 99%
rename from Libraries/LibDraw/StylePainter.cpp
rename to Libraries/LibGfx/StylePainter.cpp
index a94715c3ddf..db5a99a0952 100644
--- a/Libraries/LibDraw/StylePainter.cpp
+++ b/Libraries/LibGfx/StylePainter.cpp
@@ -24,10 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/StylePainter.h b/Libraries/LibGfx/StylePainter.h
similarity index 98%
rename from Libraries/LibDraw/StylePainter.h
rename to Libraries/LibGfx/StylePainter.h
index 9fd7d415e73..e78d45e0661 100644
--- a/Libraries/LibDraw/StylePainter.h
+++ b/Libraries/LibGfx/StylePainter.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/Color.h>
+#include <LibGfx/Color.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/SystemTheme.cpp b/Libraries/LibGfx/SystemTheme.cpp
similarity index 99%
rename from Libraries/LibDraw/SystemTheme.cpp
rename to Libraries/LibGfx/SystemTheme.cpp
index 18b7922dfd9..312a605a0f8 100644
--- a/Libraries/LibDraw/SystemTheme.cpp
+++ b/Libraries/LibGfx/SystemTheme.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <LibCore/CConfigFile.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/SystemTheme.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/SystemTheme.h b/Libraries/LibGfx/SystemTheme.h
similarity index 98%
rename from Libraries/LibDraw/SystemTheme.h
rename to Libraries/LibGfx/SystemTheme.h
index a84afb92a17..ae27b841135 100644
--- a/Libraries/LibDraw/SystemTheme.h
+++ b/Libraries/LibGfx/SystemTheme.h
@@ -28,7 +28,7 @@
 
 #include <AK/SharedBuffer.h>
 #include <AK/Types.h>
-#include <LibDraw/Color.h>
+#include <LibGfx/Color.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibDraw/TextAlignment.h b/Libraries/LibGfx/TextAlignment.h
similarity index 100%
rename from Libraries/LibDraw/TextAlignment.h
rename to Libraries/LibGfx/TextAlignment.h
diff --git a/Libraries/LibDraw/TextElision.h b/Libraries/LibGfx/TextElision.h
similarity index 100%
rename from Libraries/LibDraw/TextElision.h
rename to Libraries/LibGfx/TextElision.h
diff --git a/Libraries/LibDraw/Triangle.h b/Libraries/LibGfx/Triangle.h
similarity index 99%
rename from Libraries/LibDraw/Triangle.h
rename to Libraries/LibGfx/Triangle.h
index 23aac1516e0..3974f655a63 100644
--- a/Libraries/LibDraw/Triangle.h
+++ b/Libraries/LibGfx/Triangle.h
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Point.h>
+#include <LibGfx/Point.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibHTML/CSS/StyleProperties.h b/Libraries/LibHTML/CSS/StyleProperties.h
index fd3fdfae9d9..07c997550db 100644
--- a/Libraries/LibHTML/CSS/StyleProperties.h
+++ b/Libraries/LibHTML/CSS/StyleProperties.h
@@ -28,7 +28,7 @@
 
 #include <AK/HashMap.h>
 #include <AK/NonnullRefPtr.h>
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 #include <LibHTML/CSS/StyleValue.h>
 
 namespace Gfx {
diff --git a/Libraries/LibHTML/CSS/StyleValue.cpp b/Libraries/LibHTML/CSS/StyleValue.cpp
index 09d31914ac6..17398c8cbd2 100644
--- a/Libraries/LibHTML/CSS/StyleValue.cpp
+++ b/Libraries/LibHTML/CSS/StyleValue.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibHTML/CSS/StyleValue.h>
 #include <LibHTML/DOM/Document.h>
 #include <LibHTML/Frame.h>
diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibHTML/CSS/StyleValue.h
index 0ab130ea45a..f2a1dd76b33 100644
--- a/Libraries/LibHTML/CSS/StyleValue.h
+++ b/Libraries/LibHTML/CSS/StyleValue.h
@@ -32,8 +32,8 @@
 #include <AK/StringView.h>
 #include <AK/URL.h>
 #include <AK/WeakPtr.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibHTML/CSS/Length.h>
 #include <LibHTML/CSS/PropertyID.h>
 
diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.cpp b/Libraries/LibHTML/DOM/HTMLImageElement.cpp
index 482ea5b981c..e4e2e10e1f1 100644
--- a/Libraries/LibHTML/DOM/HTMLImageElement.cpp
+++ b/Libraries/LibHTML/DOM/HTMLImageElement.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibHTML/CSS/StyleResolver.h>
 #include <LibHTML/DOM/Document.h>
 #include <LibHTML/DOM/HTMLImageElement.h>
diff --git a/Libraries/LibHTML/DOM/HTMLImageElement.h b/Libraries/LibHTML/DOM/HTMLImageElement.h
index 1d5303db236..be8466f3bed 100644
--- a/Libraries/LibHTML/DOM/HTMLImageElement.h
+++ b/Libraries/LibHTML/DOM/HTMLImageElement.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/ImageDecoder.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/ImageDecoder.h>
 #include <LibHTML/DOM/HTMLElement.h>
 
 class LayoutDocument;
diff --git a/Libraries/LibHTML/FontCache.cpp b/Libraries/LibHTML/FontCache.cpp
index 00afe06e31b..2942d0e1e59 100644
--- a/Libraries/LibHTML/FontCache.cpp
+++ b/Libraries/LibHTML/FontCache.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 #include <LibHTML/FontCache.h>
 
 FontCache& FontCache::the()
diff --git a/Libraries/LibHTML/Frame.h b/Libraries/LibHTML/Frame.h
index a99e6757377..0d98ae4ba56 100644
--- a/Libraries/LibHTML/Frame.h
+++ b/Libraries/LibHTML/Frame.h
@@ -30,8 +30,8 @@
 #include <AK/Noncopyable.h>
 #include <AK/RefPtr.h>
 #include <AK/WeakPtr.h>
-#include <LibDraw/Rect.h>
-#include <LibDraw/Size.h>
+#include <LibGfx/Rect.h>
+#include <LibGfx/Size.h>
 #include <LibHTML/TreeNode.h>
 
 class Document;
diff --git a/Libraries/LibHTML/HtmlView.cpp b/Libraries/LibHTML/HtmlView.cpp
index a8dbdf169cf..e8deca8265a 100644
--- a/Libraries/LibHTML/HtmlView.cpp
+++ b/Libraries/LibHTML/HtmlView.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/FileSystemPath.h>
 #include <LibCore/CFile.h>
-#include <LibDraw/PNGLoader.h>
+#include <LibGfx/PNGLoader.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GScrollBar.h>
diff --git a/Libraries/LibHTML/Layout/BoxModelMetrics.h b/Libraries/LibHTML/Layout/BoxModelMetrics.h
index f8f6f7a8d33..57f146f7d5d 100644
--- a/Libraries/LibHTML/Layout/BoxModelMetrics.h
+++ b/Libraries/LibHTML/Layout/BoxModelMetrics.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/Size.h>
+#include <LibGfx/Size.h>
 #include <LibHTML/CSS/LengthBox.h>
 
 class BoxModelMetrics {
diff --git a/Libraries/LibHTML/Layout/LayoutBox.h b/Libraries/LibHTML/Layout/LayoutBox.h
index 6fcd2a5f44a..62d67f51199 100644
--- a/Libraries/LibHTML/Layout/LayoutBox.h
+++ b/Libraries/LibHTML/Layout/LayoutBox.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/FloatRect.h>
+#include <LibGfx/FloatRect.h>
 #include <LibHTML/Layout/LayoutNode.h>
 
 class LayoutBox : public LayoutNodeWithStyleAndBoxModelMetrics {
diff --git a/Libraries/LibHTML/Layout/LayoutImage.cpp b/Libraries/LibHTML/Layout/LayoutImage.cpp
index c77a412dfa0..4cf64165684 100644
--- a/Libraries/LibHTML/Layout/LayoutImage.cpp
+++ b/Libraries/LibHTML/Layout/LayoutImage.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Font.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibHTML/Layout/LayoutImage.h>
 
diff --git a/Libraries/LibHTML/Layout/LayoutNode.h b/Libraries/LibHTML/Layout/LayoutNode.h
index e1e2470016d..2f41c70df42 100644
--- a/Libraries/LibHTML/Layout/LayoutNode.h
+++ b/Libraries/LibHTML/Layout/LayoutNode.h
@@ -28,8 +28,8 @@
 
 #include <AK/NonnullRefPtr.h>
 #include <AK/Vector.h>
-#include <LibDraw/FloatRect.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/FloatRect.h>
+#include <LibGfx/Rect.h>
 #include <LibHTML/CSS/StyleProperties.h>
 #include <LibHTML/Layout/BoxModelMetrics.h>
 #include <LibHTML/Layout/LayoutPosition.h>
diff --git a/Libraries/LibHTML/Layout/LayoutText.cpp b/Libraries/LibHTML/Layout/LayoutText.cpp
index 7e92654261f..7ed3472d28e 100644
--- a/Libraries/LibHTML/Layout/LayoutText.cpp
+++ b/Libraries/LibHTML/Layout/LayoutText.cpp
@@ -27,7 +27,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Utf8View.h>
 #include <LibCore/CDirIterator.h>
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 #include <LibGUI/GPainter.h>
 #include <LibHTML/DOM/Document.h>
 #include <LibHTML/Layout/LayoutBlock.h>
diff --git a/Libraries/LibHTML/Layout/LayoutWidget.cpp b/Libraries/LibHTML/Layout/LayoutWidget.cpp
index b4ba2cde78e..1c5c3ef5301 100644
--- a/Libraries/LibHTML/Layout/LayoutWidget.cpp
+++ b/Libraries/LibHTML/Layout/LayoutWidget.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Font.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/StylePainter.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
 #include <LibHTML/Layout/LayoutWidget.h>
diff --git a/Libraries/LibHTML/Layout/LineBoxFragment.h b/Libraries/LibHTML/Layout/LineBoxFragment.h
index 318378914b6..8eb30e18320 100644
--- a/Libraries/LibHTML/Layout/LineBoxFragment.h
+++ b/Libraries/LibHTML/Layout/LineBoxFragment.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/FloatRect.h>
+#include <LibGfx/FloatRect.h>
 
 class LayoutNode;
 class RenderingContext;
diff --git a/Libraries/LibHTML/RenderingContext.h b/Libraries/LibHTML/RenderingContext.h
index 78df84335de..66814a79819 100644
--- a/Libraries/LibHTML/RenderingContext.h
+++ b/Libraries/LibHTML/RenderingContext.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibDraw/Palette.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/Rect.h>
 
 namespace GUI {
 class Painter;
diff --git a/Libraries/LibVT/TerminalWidget.cpp b/Libraries/LibVT/TerminalWidget.cpp
index b6149f21dc0..10ce8b70635 100644
--- a/Libraries/LibVT/TerminalWidget.cpp
+++ b/Libraries/LibVT/TerminalWidget.cpp
@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Font.h>
+#include <LibGfx/Font.h>
 #include <LibGUI/GAction.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GClipboard.h>
diff --git a/Libraries/LibVT/TerminalWidget.h b/Libraries/LibVT/TerminalWidget.h
index ac7c543a401..42287df2460 100644
--- a/Libraries/LibVT/TerminalWidget.h
+++ b/Libraries/LibVT/TerminalWidget.h
@@ -30,8 +30,8 @@
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CNotifier.h>
 #include <LibCore/CTimer.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Rect.h>
 #include <LibGUI/GFrame.h>
 #include <LibVT/Terminal.h>
 
diff --git a/MenuApplets/Audio/Makefile b/MenuApplets/Audio/Makefile
index 505393a09b5..1033e9f3034 100755
--- a/MenuApplets/Audio/Makefile
+++ b/MenuApplets/Audio/Makefile
@@ -2,6 +2,6 @@ OBJS = main.o
 
 PROGRAM = Audio.MenuApplet
 
-LIB_DEPS = Audio GUI IPC Draw Thread Pthread Core
+LIB_DEPS = Audio GUI IPC Gfx Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/MenuApplets/CPUGraph/Makefile b/MenuApplets/CPUGraph/Makefile
index 608636fa6b7..6c144c4a55b 100755
--- a/MenuApplets/CPUGraph/Makefile
+++ b/MenuApplets/CPUGraph/Makefile
@@ -2,6 +2,6 @@ OBJS = main.o
 
 PROGRAM = CPUGraph.MenuApplet
 
-LIB_DEPS = GUI IPC Draw Thread Pthread Core
+LIB_DEPS = GUI IPC Gfx Thread Pthread Core
 
 include ../../Makefile.common
diff --git a/MenuApplets/CPUGraph/main.cpp b/MenuApplets/CPUGraph/main.cpp
index bfff585f00c..03f4ccc7e00 100644
--- a/MenuApplets/CPUGraph/main.cpp
+++ b/MenuApplets/CPUGraph/main.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/CircularQueue.h>
 #include <LibCore/CProcessStatisticsReader.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
diff --git a/MenuApplets/Clock/Makefile b/MenuApplets/Clock/Makefile
index f68290e9e65..622012ba2a7 100755
--- a/MenuApplets/Clock/Makefile
+++ b/MenuApplets/Clock/Makefile
@@ -2,6 +2,6 @@ OBJS = main.o
 
 PROGRAM = Clock.MenuApplet
 
-LIB_DEPS = GUI IPC Draw Core
+LIB_DEPS = GUI IPC Gfx Core
 
 include ../../Makefile.common
\ No newline at end of file
diff --git a/MenuApplets/Clock/main.cpp b/MenuApplets/Clock/main.cpp
index f0b9af95148..f3fc22db9fd 100644
--- a/MenuApplets/Clock/main.cpp
+++ b/MenuApplets/Clock/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <LibCore/CTimer.h>
-#include <LibDraw/Palette.h>
+#include <LibGfx/Palette.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile
index 1ba3e8ae922..8310f2f6ac6 100644
--- a/Servers/WindowServer/Makefile
+++ b/Servers/WindowServer/Makefile
@@ -18,7 +18,7 @@ OBJS = \
 
 PROGRAM = WindowServer
 
-LIB_DEPS = Draw Core Thread Pthread IPC
+LIB_DEPS = Gfx Core Thread Pthread IPC
 
 *.cpp: WindowServerEndpoint.h WindowClientEndpoint.h
 
diff --git a/Servers/WindowServer/WSButton.cpp b/Servers/WindowServer/WSButton.cpp
index 6647fea516b..fd901fd6e7d 100644
--- a/Servers/WindowServer/WSButton.cpp
+++ b/Servers/WindowServer/WSButton.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSButton.h b/Servers/WindowServer/WSButton.h
index b00c53e4336..ac25210bdc6 100644
--- a/Servers/WindowServer/WSButton.h
+++ b/Servers/WindowServer/WSButton.h
@@ -29,7 +29,7 @@
 #include <AK/Function.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace Gfx {
 class CharacterBitmap;
diff --git a/Servers/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
index b4ac4482bf0..d95aee9e503 100644
--- a/Servers/WindowServer/WSClientConnection.cpp
+++ b/Servers/WindowServer/WSClientConnection.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/SharedBuffer.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/SystemTheme.h>
 #include <WindowServer/WSClientConnection.h>
 #include <WindowServer/WSClipboard.h>
 #include <WindowServer/WSCompositor.h>
diff --git a/Servers/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
index 6ada8239030..6987a2921bd 100644
--- a/Servers/WindowServer/WSClientConnection.h
+++ b/Servers/WindowServer/WSClientConnection.h
@@ -31,7 +31,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 #include <LibIPC/IClientConnection.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WindowServerEndpoint.h>
diff --git a/Servers/WindowServer/WSCompositor.cpp b/Servers/WindowServer/WSCompositor.cpp
index a28b6d3f859..ef8afeaf63e 100644
--- a/Servers/WindowServer/WSCompositor.cpp
+++ b/Servers/WindowServer/WSCompositor.cpp
@@ -30,9 +30,9 @@
 #include "WSScreen.h"
 #include "WSWindow.h"
 #include "WSWindowManager.h"
-#include <LibDraw/Font.h>
-#include <LibDraw/PNGLoader.h>
-#include <LibDraw/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/PNGLoader.h>
+#include <LibGfx/Painter.h>
 #include <LibThread/BackgroundAction.h>
 
 // #define COMPOSITOR_DEBUG
diff --git a/Servers/WindowServer/WSCompositor.h b/Servers/WindowServer/WSCompositor.h
index 32028558021..a8ab9dd9ae7 100644
--- a/Servers/WindowServer/WSCompositor.h
+++ b/Servers/WindowServer/WSCompositor.h
@@ -30,8 +30,8 @@
 #include <AK/RefPtr.h>
 #include <LibCore/CObject.h>
 #include <LibCore/CTimer.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 namespace Gfx {
 class Painter;
diff --git a/Servers/WindowServer/WSCursor.h b/Servers/WindowServer/WSCursor.h
index 0e60324d07e..6db202ddd62 100644
--- a/Servers/WindowServer/WSCursor.h
+++ b/Servers/WindowServer/WSCursor.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 enum class WSStandardCursor {
     None = 0,
diff --git a/Servers/WindowServer/WSEvent.h b/Servers/WindowServer/WSEvent.h
index ebb5e535299..f909dc5cc9a 100644
--- a/Servers/WindowServer/WSEvent.h
+++ b/Servers/WindowServer/WSEvent.h
@@ -29,7 +29,7 @@
 #include <AK/String.h>
 #include <Kernel/KeyCode.h>
 #include <LibCore/CEvent.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSWindowType.h>
 
diff --git a/Servers/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
index 805e0ad3027..fb1b1444bb4 100644
--- a/Servers/WindowServer/WSMenu.cpp
+++ b/Servers/WindowServer/WSMenu.cpp
@@ -33,12 +33,12 @@
 #include "WSScreen.h"
 #include "WSWindow.h"
 #include "WSWindowManager.h"
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
-#include <LibDraw/Triangle.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
+#include <LibGfx/Triangle.h>
 #include <WindowServer/WSClientConnection.h>
 #include <WindowServer/WindowClientEndpoint.h>
 
diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h
index a8f501651d1..2a0f615bbcd 100644
--- a/Servers/WindowServer/WSMenu.h
+++ b/Servers/WindowServer/WSMenu.h
@@ -30,7 +30,7 @@
 #include <AK/String.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSMenuItem.h>
 #include <WindowServer/WSWindow.h>
diff --git a/Servers/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp
index 0d1ada276c7..f4e5a65ce3f 100644
--- a/Servers/WindowServer/WSMenuBar.cpp
+++ b/Servers/WindowServer/WSMenuBar.cpp
@@ -27,7 +27,7 @@
 #include "WSMenuBar.h"
 #include "WSMenu.h"
 #include "WSMenuItem.h"
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 WSMenuBar::WSMenuBar(WSClientConnection& client, int menubar_id)
     : m_client(client)
diff --git a/Servers/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp
index 7af94f16044..e2daa4e2dd5 100644
--- a/Servers/WindowServer/WSMenuItem.cpp
+++ b/Servers/WindowServer/WSMenuItem.cpp
@@ -28,7 +28,7 @@
 #include "WSClientConnection.h"
 #include "WSMenu.h"
 #include "WSWindowManager.h"
-#include <LibDraw/GraphicsBitmap.h>
+#include <LibGfx/GraphicsBitmap.h>
 
 WSMenuItem::WSMenuItem(WSMenu& menu, unsigned identifier, const String& text, const String& shortcut_text, bool enabled, bool checkable, bool checked, const Gfx::Bitmap* icon)
     : m_menu(menu)
diff --git a/Servers/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h
index 5c049d63c9b..6547fdb9368 100644
--- a/Servers/WindowServer/WSMenuItem.h
+++ b/Servers/WindowServer/WSMenuItem.h
@@ -28,7 +28,7 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace Gfx {
 class Bitmap;
diff --git a/Servers/WindowServer/WSMenuManager.cpp b/Servers/WindowServer/WSMenuManager.cpp
index 7bc2f898608..0250fb06c49 100644
--- a/Servers/WindowServer/WSMenuManager.cpp
+++ b/Servers/WindowServer/WSMenuManager.cpp
@@ -27,9 +27,9 @@
 #include <AK/FileSystemPath.h>
 #include <AK/QuickSort.h>
 #include <LibCore/CDirIterator.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/PNGLoader.h>
-#include <LibDraw/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/PNGLoader.h>
+#include <LibGfx/Painter.h>
 #include <WindowServer/WSMenuManager.h>
 #include <WindowServer/WSScreen.h>
 #include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h
index 7fc02b982cb..34b62343807 100644
--- a/Servers/WindowServer/WSScreen.h
+++ b/Servers/WindowServer/WSScreen.h
@@ -27,9 +27,9 @@
 #pragma once
 
 #include <Kernel/KeyCode.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/Rect.h>
-#include <LibDraw/Size.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/Rect.h>
+#include <LibGfx/Size.h>
 
 struct MousePacket;
 
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index 8bc9f3cb52d..b8935f06277 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -29,9 +29,9 @@
 #include <AK/InlineLinkedList.h>
 #include <AK/String.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Rect.h>
 #include <WindowServer/WSWindowFrame.h>
 #include <WindowServer/WSWindowType.h>
 
diff --git a/Servers/WindowServer/WSWindowFrame.cpp b/Servers/WindowServer/WSWindowFrame.cpp
index 80c1f0a28cc..998f4d863fa 100644
--- a/Servers/WindowServer/WSWindowFrame.cpp
+++ b/Servers/WindowServer/WSWindowFrame.cpp
@@ -24,10 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSCompositor.h>
 #include <WindowServer/WSEvent.h>
diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
index 4a76de30279..daa6f873d6b 100644
--- a/Servers/WindowServer/WSWindowManager.cpp
+++ b/Servers/WindowServer/WSWindowManager.cpp
@@ -35,11 +35,11 @@
 #include <AK/LogStream.h>
 #include <AK/StdLibExtras.h>
 #include <AK/Vector.h>
-#include <LibDraw/CharacterBitmap.h>
-#include <LibDraw/Font.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/StylePainter.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/StylePainter.h>
+#include <LibGfx/SystemTheme.h>
 #include <WindowServer/WSButton.h>
 #include <WindowServer/WSClientConnection.h>
 #include <WindowServer/WSCursor.h>
diff --git a/Servers/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
index 63e59b128df..70774770972 100644
--- a/Servers/WindowServer/WSWindowManager.h
+++ b/Servers/WindowServer/WSWindowManager.h
@@ -32,11 +32,11 @@
 #include <AK/WeakPtr.h>
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CElapsedTimer.h>
-#include <LibDraw/Color.h>
-#include <LibDraw/DisjointRectSet.h>
-#include <LibDraw/Painter.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Color.h>
+#include <LibGfx/DisjointRectSet.h>
+#include <LibGfx/Painter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/Rect.h>
 #include <WindowServer/WSCursor.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSMenuBar.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
index f7e8b2b8b96..34d325d5a9c 100644
--- a/Servers/WindowServer/WSWindowSwitcher.cpp
+++ b/Servers/WindowServer/WSWindowSwitcher.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibDraw/Font.h>
-#include <LibDraw/GraphicsBitmap.h>
-#include <LibDraw/StylePainter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/StylePainter.h>
 #include <WindowServer/WSEvent.h>
 #include <WindowServer/WSScreen.h>
 #include <WindowServer/WSWindowManager.h>
diff --git a/Servers/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h
index 192640b1275..a82011d6128 100644
--- a/Servers/WindowServer/WSWindowSwitcher.h
+++ b/Servers/WindowServer/WSWindowSwitcher.h
@@ -29,7 +29,7 @@
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
-#include <LibDraw/Rect.h>
+#include <LibGfx/Rect.h>
 
 namespace Gfx {
 class Painter;
diff --git a/Servers/WindowServer/main.cpp b/Servers/WindowServer/main.cpp
index 4a0a4f5ab93..e9187b79175 100644
--- a/Servers/WindowServer/main.cpp
+++ b/Servers/WindowServer/main.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <LibCore/CConfigFile.h>
-#include <LibDraw/Palette.h>
-#include <LibDraw/SystemTheme.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/SystemTheme.h>
 #include <WindowServer/WSCompositor.h>
 #include <WindowServer/WSEventLoop.h>
 #include <WindowServer/WSScreen.h>
diff --git a/Userland/Makefile b/Userland/Makefile
index cede7cf5473..717c41425b4 100644
--- a/Userland/Makefile
+++ b/Userland/Makefile
@@ -4,7 +4,7 @@ APPS = ${SRCS:.cpp=}
 
 EXTRA_CLEAN = $(APPS)
 
-LIB_DEPS = HTML GUI Draw Audio Protocol IPC Thread Pthread Core PCIDB Markdown
+LIB_DEPS = HTML GUI Gfx Audio Protocol IPC Thread Pthread Core PCIDB Markdown
 
 include ../Makefile.common