diff --git a/app/src/main/kotlin/org/fossify/keyboard/extensions/KeyboardLanguageExt.kt b/app/src/main/kotlin/org/fossify/keyboard/extensions/KeyboardLanguageExt.kt
index d7aa20cf..d06d0056 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/extensions/KeyboardLanguageExt.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/extensions/KeyboardLanguageExt.kt
@@ -14,6 +14,7 @@ import org.fossify.keyboard.helpers.LANGUAGE_CHUVASH
 import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTY
 import org.fossify.keyboard.helpers.LANGUAGE_CZECH_QWERTZ
 import org.fossify.keyboard.helpers.LANGUAGE_DANISH
+import org.fossify.keyboard.helpers.LANGUAGE_DHIVEHI
 import org.fossify.keyboard.helpers.LANGUAGE_DUTCH
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_ASSET
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAK
@@ -74,6 +75,7 @@ fun Context.getKeyboardLanguageText(language: Int): String {
         LANGUAGE_CZECH_QWERTY -> "${getString(R.string.translation_czech)} (QWERTY)"
         LANGUAGE_CZECH_QWERTZ -> "${getString(R.string.translation_czech)} (QWERTZ)"
         LANGUAGE_DANISH -> getString(R.string.translation_danish)
+        LANGUAGE_DHIVEHI -> "Dhivehi"
         LANGUAGE_DUTCH -> getString(R.string.translation_dutch)
         LANGUAGE_ENGLISH_ASSET -> "${getString(R.string.translation_english)} (Asset)"
         LANGUAGE_ENGLISH_COLEMAK -> "${getString(R.string.translation_english)} (Colemak)"
diff --git a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
index c31276db..9f9fed63 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/helpers/Constants.kt
@@ -80,6 +80,8 @@ const val LANGUAGE_ENGLISH_COLEMAKDH = 41
 const val LANGUAGE_ENGLISH_NIRO = 42
 const val LANGUAGE_ENGLISH_SOUL = 43
 const val LANGUAGE_ENGLISH_WORKMAN = 44
+const val LANGUAGE_DHIVEHI = 45
+
 
 // Keep this sorted
 val SUPPORTED_LANGUAGES = listOf(
@@ -103,6 +105,7 @@ val SUPPORTED_LANGUAGES = listOf(
     LANGUAGE_ENGLISH_NIRO,
     LANGUAGE_ENGLISH_SOUL,
     LANGUAGE_ENGLISH_WORKMAN,
+    LANGUAGE_DHIVEHI,
     LANGUAGE_ESPERANTO,
     LANGUAGE_FRENCH_AZERTY,
     LANGUAGE_FRENCH_BEPO,
diff --git a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
index 73472a46..1c47814c 100644
--- a/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
+++ b/app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
@@ -89,6 +89,7 @@ import org.fossify.keyboard.helpers.LANGUAGE_DUTCH
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_ASSET
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAK
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_COLEMAKDH
+import org.fossify.keyboard.helpers.LANGUAGE_DHIVEHI
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_DVORAK
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_NIRO
 import org.fossify.keyboard.helpers.LANGUAGE_ENGLISH_QWERTZ
@@ -551,6 +552,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
             LANGUAGE_CZECH_QWERTZ -> R.xml.keys_letters_czech_qwertz
             LANGUAGE_DANISH -> R.xml.keys_letters_danish
             LANGUAGE_DUTCH -> R.xml.keys_letters_dutch
+            LANGUAGE_DHIVEHI -> R.xml.keys_letters_dhivehi
             LANGUAGE_ENGLISH_ASSET -> R.xml.keys_letters_english_asset
             LANGUAGE_ENGLISH_COLEMAK -> R.xml.keys_letters_english_colemak
             LANGUAGE_ENGLISH_COLEMAKDH -> R.xml.keys_letters_english_colemakdh
diff --git a/app/src/main/res/xml/keys_letters_dhivehi.xml b/app/src/main/res/xml/keys_letters_dhivehi.xml
new file mode 100644
index 00000000..4921b57b
--- /dev/null
+++ b/app/src/main/res/xml/keys_letters_dhivehi.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Row app:isNumbersRow="true">
+        <Key app:keyEdgeFlags="left" app:keyLabel="1" app:topSmallNumber="1" />
+        <Key app:keyLabel="2" app:topSmallNumber="2" />
+        <Key app:keyLabel="3" app:topSmallNumber="3" />
+        <Key app:keyLabel="4" app:topSmallNumber="4" />
+        <Key app:keyLabel="5" app:topSmallNumber="5" />
+        <Key app:keyLabel="6" app:topSmallNumber="6" />
+        <Key app:keyLabel="7" app:topSmallNumber="7" />
+        <Key app:keyLabel="8" app:topSmallNumber="8" />
+        <Key app:keyLabel="9" app:topSmallNumber="9" />
+        <Key app:keyEdgeFlags="right" app:keyLabel="0" app:topSmallNumber="0" />
+    </Row>
+
+    <Row>
+        <Key app:keyEdgeFlags="left" app:keyLabel="ް" app:popupCharacters="ޤ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="1" />
+        <Key app:keyLabel="ޢ" app:popupCharacters="އ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="2" />
+        <Key app:keyLabel="ެ" app:popupCharacters="ޭ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="3" />
+        <Key app:keyLabel="ރ" app:popupCharacters="ޜ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="4" />
+        <Key app:keyLabel="ތ" app:popupCharacters="ޓ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="5" />
+        <Key app:keyLabel="ޔ" app:popupCharacters="ޘ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="6" />
+        <Key app:keyLabel="ު" app:popupCharacters="ޫ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="7" />
+        <Key app:keyLabel="ި" app:popupCharacters="ީ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="8" />
+        <Key app:keyLabel="ޮ" app:popupCharacters="ޯ" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="9" />
+        <Key app:keyEdgeFlags="right" app:keyLabel="ޕ" app:popupCharacters="÷" app:popupKeyboard="@xml/keyboard_popup_template" app:topSmallNumber="0" />
+    </Row>
+
+    <Row>
+        <Key app:horizontalGap="5%" app:keyEdgeFlags="left" app:keyLabel="ަ" app:popupCharacters="ާ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ސ" app:popupCharacters="ށ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ދ" app:popupCharacters="ޑ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ފ" app:popupCharacters="ﷲ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ގ" app:popupCharacters="ޣ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ހ" app:popupCharacters="ޙ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ޖ" app:popupCharacters="ޛ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ކ" app:popupCharacters="ޚ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyEdgeFlags="right" app:keyLabel="ލ" app:popupCharacters="ޅ" app:popupKeyboard="@xml/keyboard_popup_template" />
+    </Row>
+
+    <Row>
+        <Key app:code="-1" app:keyEdgeFlags="left" app:keyIcon="@drawable/ic_caps_outline_vector" app:keyWidth="15%p" />
+        <Key app:keyLabel="ޒ" app:popupCharacters="ޜ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ޘ" app:popupCharacters="×" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ޝ" app:popupCharacters="ޗ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ވ" />
+        <Key app:keyLabel="ބ" app:popupCharacters="ޟ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="ނ" app:popupCharacters="ޏ" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:keyLabel="މ" />
+        <Key app:code="-5" app:isRepeatable="true" app:keyEdgeFlags="right" app:keyIcon="@drawable/ic_clear_vector" app:keyWidth="15%p" />
+    </Row>
+
+    <Row>
+        <Key app:code="-2" app:keyEdgeFlags="left" app:keyLabel="\?123" app:keyWidth="15%p" />
+        <Key app:keyLabel="،" app:keyWidth="10%p" app:keyRole="tools" app:popupKeyboard="@xml/popup_tools_with_emoji_key" app:secondaryKeyIcon="@drawable/ic_emoji_emotions_outline_vector" />
+        <Key app:code="-6" app:keyEdgeFlags="left" app:keyIcon="@drawable/ic_emoji_emotions_outline_vector" app:keyWidth="10%p" app:secondaryKeyIcon="@drawable/ic_language_outlined" />
+        <Key app:code="32" app:isRepeatable="true" app:keyWidth="40%p" />
+        <Key app:keyLabel="." app:keyWidth="10%p" app:popupCharacters="،؟!؛:'…" app:popupKeyboard="@xml/keyboard_popup_template" />
+        <Key app:code="-4" app:keyEdgeFlags="right" app:keyIcon="@drawable/ic_enter_vector" app:keyWidth="15%p" />
+    </Row>
+</Keyboard>