diff --git a/oni-gui.el b/oni-gui.el
new file mode 100644
index 0000000..5613a1c
--- /dev/null
+++ b/oni-gui.el
@@ -0,0 +1,38 @@
+;;; oni-gui.el --- GUI settings for Emacs            -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190124011713
+;; Package-Requires: (oni-ui)
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; These are my GUI settings.
+
+;;; Code:
+
+(add-to-list 'default-frame-alist '(font . "Fantasque Sans Mono-15"))
+(add-to-list 'default-frame-alist '(internal-border-width . 15))
+
+(setq-default cursor-type '(bar . 2))
+(setq-default cursor-in-non-selected-windows 'box)
+
+(load-theme 'yoshi :no-confirm)
+
+(provide 'oni-gui)
+;;; oni-gui.el ends here
diff --git a/oni-ui.el b/oni-ui.el
new file mode 100644
index 0000000..10dd3f5
--- /dev/null
+++ b/oni-ui.el
@@ -0,0 +1,33 @@
+;;; oni-ui.el --- Common UI settings                 -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+;; Version: 20190124011612
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Common settings for UI, regardless of which type (GUI, TUI).
+
+;;; Code:
+
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+
+(provide 'oni-ui)
+;;; oni-ui.el ends here