diff --git a/config/packages.mk b/config/packages.mk
index 1abf3d2..d12102f 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -56,7 +56,8 @@
     DarknessMeisterTheme \
     SmokedGreenTheme \
     Bl4ckAndYell0Theme \
-    OmniTheme
+    OmniTheme \
+    GboardDarkTheme
 
 PRODUCT_PACKAGES += \
     Launcher3Dark
diff --git a/google/themes/GboardDarkTheme/Android.mk b/google/themes/GboardDarkTheme/Android.mk
new file mode 100644
index 0000000..3c7783e
--- /dev/null
+++ b/google/themes/GboardDarkTheme/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_PACKAGE_NAME := GBoardDarkTheme
+LOCAL_SDK_VERSION := current
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := false
+
+include $(BUILD_PACKAGE)
diff --git a/google/themes/GboardDarkTheme/AndroidManifest.xml b/google/themes/GboardDarkTheme/AndroidManifest.xml
new file mode 100644
index 0000000..b139d81
--- /dev/null
+++ b/google/themes/GboardDarkTheme/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.gboard.theme.dark"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="com.google.android.inputmethod.latin" android:priority="1"/>
+
+    <application android:label="@string/gboard_overlay_dark" android:hasCode="false"/>
+</manifest>
diff --git a/google/themes/GboardDarkTheme/res/values-v21/colors.xml b/google/themes/GboardDarkTheme/res/values-v21/colors.xml
new file mode 100644
index 0000000..51b56ec
--- /dev/null
+++ b/google/themes/GboardDarkTheme/res/values-v21/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="language_picker_text_color">@android:color/white</color>
+
+</resources>
diff --git a/google/themes/GboardDarkTheme/res/values/colors.xml b/google/themes/GboardDarkTheme/res/values/colors.xml
new file mode 100644
index 0000000..8ffde03
--- /dev/null
+++ b/google/themes/GboardDarkTheme/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="language_picker_radio_button_tint">@*android:color/accent_device_default_light</color>
+
+</resources>
diff --git a/google/themes/GboardDarkTheme/res/values/strings.xml b/google/themes/GboardDarkTheme/res/values/strings.xml
new file mode 100644
index 0000000..f540f40
--- /dev/null
+++ b/google/themes/GboardDarkTheme/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2017, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="gboard_overlay_dark">Dark</string>
+
+</resources>