diff --git a/Base/etc/WindowServer/WindowServer.ini b/Base/etc/WindowServer.ini
similarity index 100%
rename from Base/etc/WindowServer/WindowServer.ini
rename to Base/etc/WindowServer.ini
diff --git a/Base/usr/share/man/man2/unveil.md b/Base/usr/share/man/man2/unveil.md
index ba8c6574ba..9cdbc60adb 100644
--- a/Base/usr/share/man/man2/unveil.md
+++ b/Base/usr/share/man/man2/unveil.md
@@ -74,7 +74,7 @@ The `unveil()` system call was first introduced by OpenBSD.
 unveil("/res", "r");
 
 // Allow the process to read, write, and create the config file:
-unveil("/etc/WindowServer/WindowServer.ini", "rwc");
+unveil("/etc/WindowServer.ini", "rwc");
 
 // Allow the process to execute Calendar:
 unveil("/bin/Calendar", "x");
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index a872f5fcc4..888dbb57c9 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -46,8 +46,8 @@ $CP "$SERENITY_SOURCE_DIR"/Toolchain/Local/i686/i686-pc-serenity/lib/libgcc_s.so
 # the permissions needed in the image.
 chmod -R g+rX,o+rX "$SERENITY_SOURCE_DIR"/Base/* mnt/
 
-chmod 660 mnt/etc/WindowServer/WindowServer.ini
-chown $window_uid:$window_gid mnt/etc/WindowServer/WindowServer.ini
+chmod 660 mnt/etc/WindowServer.ini
+chown $window_uid:$window_gid mnt/etc/WindowServer.ini
 echo "/bin/sh" > mnt/etc/shells
 
 chown 0:$wheel_gid mnt/bin/su
diff --git a/Ports/neofetch/patches/add-serenity-support.patch b/Ports/neofetch/patches/add-serenity-support.patch
index d009767afd..8cfca68745 100644
--- a/Ports/neofetch/patches/add-serenity-support.patch
+++ b/Ports/neofetch/patches/add-serenity-support.patch
@@ -126,7 +126,7 @@
      unset gtk2_theme gtk3_theme theme path
  
 +    if [[ "$os" == "SerenityOS" ]]; then
-+        theme=$(ini /etc/WindowServer/WindowServer.ini Theme Name)
++        theme=$(ini /etc/WindowServer.ini Theme Name)
 +        if [ -z "$theme" ]; then
 +            theme="Default"
 +        fi
diff --git a/Userland/Applications/DisplaySettings/DisplaySettings.cpp b/Userland/Applications/DisplaySettings/DisplaySettings.cpp
index 6fe579bfbd..7c80bac763 100644
--- a/Userland/Applications/DisplaySettings/DisplaySettings.cpp
+++ b/Userland/Applications/DisplaySettings/DisplaySettings.cpp
@@ -175,7 +175,7 @@ void DisplaySettingsWidget::create_frame()
 
 void DisplaySettingsWidget::load_current_settings()
 {
-    auto ws_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"));
+    auto ws_config(Core::ConfigFile::open("/etc/WindowServer.ini"));
     auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
 
     /// Wallpaper path ////////////////////////////////////////////////////////////////////////////
@@ -253,7 +253,7 @@ void DisplaySettingsWidget::load_current_settings()
 void DisplaySettingsWidget::send_settings_to_window_server()
 {
     // Store the current screen resolution and scale factor in case the user wants to revert to it.
-    auto ws_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"));
+    auto ws_config(Core::ConfigFile::open("/etc/WindowServer.ini"));
     Gfx::IntSize current_resolution;
     current_resolution.set_width(ws_config->read_num_entry("Screen", "Width", 1024));
     current_resolution.set_height(ws_config->read_num_entry("Screen", "Height", 768));
diff --git a/Userland/Services/WindowServer/AppletManager.cpp b/Userland/Services/WindowServer/AppletManager.cpp
index ffeb52ec66..2885441664 100644
--- a/Userland/Services/WindowServer/AppletManager.cpp
+++ b/Userland/Services/WindowServer/AppletManager.cpp
@@ -20,7 +20,7 @@ AppletManager::AppletManager()
 {
     s_the = this;
 
-    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
     auto order = wm_config->read_entry("Applet", "Order");
     order_vector = order.split(',');
 }
diff --git a/Userland/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
index efd7e65a8c..5c980af88a 100644
--- a/Userland/Services/WindowServer/ClientConnection.cpp
+++ b/Userland/Services/WindowServer/ClientConnection.cpp
@@ -738,7 +738,7 @@ OwnPtr<Messages::WindowServer::SetSystemThemeResponse> ClientConnection::handle(
 
 OwnPtr<Messages::WindowServer::GetSystemThemeResponse> ClientConnection::handle(const Messages::WindowServer::GetSystemTheme&)
 {
-    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
     auto name = wm_config->read_entry("Theme", "Name");
     return make<Messages::WindowServer::GetSystemThemeResponse>(name);
 }
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
index ae2768ad7f..30daf61036 100644
--- a/Userland/Services/WindowServer/WindowManager.cpp
+++ b/Userland/Services/WindowServer/WindowManager.cpp
@@ -69,7 +69,7 @@ NonnullRefPtr<Cursor> WindowManager::get_cursor(const String& name)
 
 void WindowManager::reload_config()
 {
-    m_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+    m_config = Core::ConfigFile::open("/etc/WindowServer.ini");
 
     m_double_click_speed = m_config->read_num_entry("Input", "DoubleClickSpeed", 250);
     m_hidden_cursor = get_cursor("Hidden");
@@ -1547,7 +1547,7 @@ bool WindowManager::update_theme(String theme_path, String theme_name)
     });
     MenuManager::the().did_change_theme();
     AppletManager::the().did_change_theme();
-    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
     wm_config->write_entry("Theme", "Name", theme_name);
     wm_config->sync();
     Compositor::the().invalidate_occlusions();
diff --git a/Userland/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp
index d676ec11d2..d581995473 100644
--- a/Userland/Services/WindowServer/main.cpp
+++ b/Userland/Services/WindowServer/main.cpp
@@ -34,8 +34,8 @@ int main(int, char**)
         return 1;
     }
 
-    if (unveil("/etc/WindowServer/WindowServer.ini", "rwc") < 0) {
-        perror("unveil /etc/WindowServer/WindowServer.ini");
+    if (unveil("/etc/WindowServer.ini", "rwc") < 0) {
+        perror("unveil /etc/WindowServer.ini");
         return 1;
     }
 
@@ -54,7 +54,7 @@ int main(int, char**)
         return 1;
     }
 
-    auto wm_config = Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini");
+    auto wm_config = Core::ConfigFile::open("/etc/WindowServer.ini");
     auto theme_name = wm_config->read_entry("Theme", "Name", "Default");
 
     auto theme = Gfx::load_system_theme(String::formatted("/res/themes/{}.ini", theme_name));