19 files changed, 19 insertions, 19 deletions
diff --git a/src/chat_session.c b/src/chat_session.c
index d97a5184..281f4b96 100644
--- a/src/chat_session.c
+++ b/src/chat_session.c
@@ -27,8 +27,8 @@
 
 #include "chat_session.h"
 
+#include "config/preferences.h"
 #include "log.h"
-#include "preferences.h"
 
 #define PAUSED_TIMOUT 10.0
 #define INACTIVE_TIMOUT 30.0
diff --git a/src/command/command.c b/src/command/command.c
index 778339fa..05123015 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -27,20 +27,20 @@
 
 #include <glib.h>
 
-#include "accounts.h"
 #include "chat_session.h"
 #include "command/command.h"
 #include "command/history.h"
 #include "command/parser.h"
 #include "common.h"
+#include "config/accounts.h"
+#include "config/preferences.h"
+#include "config/theme.h"
 #include "contact.h"
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
 #include "profanity.h"
-#include "theme.h"
 #include "tools/autocomplete.h"
 #include "tools/tinyurl.h"
 #include "ui/ui.h"
diff --git a/src/accounts.c b/src/config/accounts.c
index 6549819b..6549819b 100644
--- a/src/accounts.c
+++ b/src/config/accounts.c
diff --git a/src/accounts.h b/src/config/accounts.h
index a9292a02..a9292a02 100644
--- a/src/accounts.h
+++ b/src/config/accounts.h
diff --git a/src/preferences.c b/src/config/preferences.c
index b2414fca..b2414fca 100644
--- a/src/preferences.c
+++ b/src/config/preferences.c
diff --git a/src/preferences.h b/src/config/preferences.h
index a68dc16b..a68dc16b 100644
--- a/src/preferences.h
+++ b/src/config/preferences.h
diff --git a/src/theme.c b/src/config/theme.c
index ec061ce4..ec061ce4 100644
--- a/src/theme.c
+++ b/src/config/theme.c
diff --git a/src/theme.h b/src/config/theme.h
index d87b69f2..d87b69f2 100644
--- a/src/theme.h
+++ b/src/config/theme.h
diff --git a/src/log.c b/src/log.c
index fd7bd370..0282f60f 100644
--- a/src/log.c
+++ b/src/log.c
@@ -32,8 +32,8 @@
 #include "log.h"
 
 #include "common.h"
+#include "config/preferences.h"
 #include "files.h"
-#include "preferences.h"
 
 #define PROF "prof"
 
diff --git a/src/profanity.c b/src/profanity.c
index a5514b57..f0a9372e 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -31,8 +31,10 @@
 
 #include "profanity.h"
 
-#include "accounts.h"
 #include "chat_session.h"
+#include "config/accounts.h"
+#include "config/preferences.h"
+#include "config/theme.h"
 #include "command/command.h"
 #include "common.h"
 #include "contact.h"
@@ -40,8 +42,6 @@
 #include "files.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
-#include "theme.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 5ddafa97..427d229c 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -35,11 +35,11 @@
 
 #include "command/command.h"
 #include "common.h"
+#include "config/preferences.h"
+#include "config/theme.h"
 #include "contact_list.h"
 #include "log.h"
-#include "preferences.h"
 #include "profanity.h"
-#include "theme.h"
 #include "ui/ui.h"
 
 #define _inp_win_refresh() prefresh(inp_win, 0, pad_start, rows-1, 0, rows-1, cols-1)
diff --git a/src/ui/statusbar.c b/src/ui/statusbar.c
index 7d894f07..a2b09470 100644
--- a/src/ui/statusbar.c
+++ b/src/ui/statusbar.c
@@ -31,7 +31,7 @@
 #include <ncurses.h>
 #endif
 
-#include "theme.h"
+#include "config/theme.h"
 #include "ui/ui.h"
 
 static WINDOW *status_bar;
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index fc208063..2276986a 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "common.h"
-#include "theme.h"
+#include "config/theme.h"
 #include "ui/ui.h"
 
 static WINDOW *title_bar;
diff --git a/src/ui/window.c b/src/ui/window.c
index b9c5d9cb..85648814 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -32,7 +32,7 @@
 #include <ncurses.h>
 #endif
 
-#include "theme.h"
+#include "config/theme.h"
 #include "ui/window.h"
 
 #define CONS_WIN_TITLE "_cons"
diff --git a/src/ui/windows.c b/src/ui/windows.c
index 1fa1c01d..a868aa5f 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -43,13 +43,13 @@
 #include "chat_session.h"
 #include "command/command.h"
 #include "common.h"
+#include "config/preferences.h"
+#include "config/theme.h"
 #include "contact.h"
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
-#include "theme.h"
 #include "ui/ui.h"
 #include "ui/window.h"
 
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 93512f5e..57528bb6 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -28,11 +28,11 @@
 
 #include "chat_session.h"
 #include "common.h"
+#include "config/preferences.h"
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
 #include "profanity.h"
 #include "xmpp/iq.h"
 #include "xmpp/message.h"
diff --git a/src/xmpp/message.c b/src/xmpp/message.c
index 42769cf7..b20d773b 100644
--- a/src/xmpp/message.c
+++ b/src/xmpp/message.c
@@ -26,9 +26,9 @@
 #include <strophe.h>
 
 #include "chat_session.h"
+#include "config/preferences.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
 #include "profanity.h"
 #include "xmpp/message.h"
 #include "xmpp/stanza.h"
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index f4631b12..7fd58df6 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -26,9 +26,9 @@
 #include <glib.h>
 
 #include "common.h"
+#include "config/preferences.h"
 #include "log.h"
 #include "muc.h"
-#include "preferences.h"
 #include "profanity.h"
 #include "xmpp/capabilities.h"
 #include "xmpp/stanza.h"
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index ab22d191..d81be248 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -25,7 +25,7 @@
 
 #include <strophe.h>
 
-#include "accounts.h"
+#include "config/accounts.h"
 #include "jid.h"
 
 #define JABBER_PRIORITY_MIN -128