diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/inputlogic/InputLogic.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/inputlogic/InputLogic.java
index c978ec7e98..a1450665a5 100644
--- a/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/inputlogic/InputLogic.java
+++ b/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/inputlogic/InputLogic.java
@@ -391,6 +391,7 @@ private boolean layoutUsesAutoCaps(final String layoutSetName) {
             case SubtypeLocaleUtils.LAYOUT_ERGOL:
             case SubtypeLocaleUtils.LAYOUT_FARSI:
             case SubtypeLocaleUtils.LAYOUT_GEORGIAN:
+            case SubtypeLocaleUtils.LAYOUT_HCESAR:
             case SubtypeLocaleUtils.LAYOUT_HEBREW:
             case SubtypeLocaleUtils.LAYOUT_HINDI:
             case SubtypeLocaleUtils.LAYOUT_HINDI_COMPACT:
diff --git a/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/utils/SubtypeLocaleUtils.java b/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
index a8ea6aab18..df74c1b60e 100644
--- a/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
+++ b/app/src/main/java/rkr/simplekeyboard/inputmethod/latin/utils/SubtypeLocaleUtils.java
@@ -219,6 +219,7 @@ public static List<String> getSupportedLocales() {
     public static final String LAYOUT_FARSI = "farsi";
     public static final String LAYOUT_GEORGIAN = "georgian";
     public static final String LAYOUT_GREEK = "greek";
+    public static final String LAYOUT_HCESAR = "hcesar";
     public static final String LAYOUT_HEBREW = "hebrew";
     public static final String LAYOUT_HINDI = "hindi";
     public static final String LAYOUT_HINDI_COMPACT = "hindi_compact";
@@ -387,6 +388,7 @@ public List<Subtype> getSubtypes() {
                 case LOCALE_POLISH:
                 case LOCALE_PORTUGUESE_BRAZIL:
                 case LOCALE_PORTUGUESE_PORTUGAL:
+                    addLayout(LAYOUT_HCESAR);				
                 case LOCALE_ROMANIAN:
                 case LOCALE_SLOVAK:
                 case LOCALE_SWAHILI:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f70fbd052c..a516cc04d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -79,6 +79,8 @@
     <string name="subtype_akkhor">Akkhor</string>
     <!-- Description for Ergo-L keyboard layout. -->
     <string name="subtype_ergol">Ergo-L</string>
+	<!-- Description for Hcesar keyboard layout. -->
+    <string name="subtype_hcesar">Hcesar</string>
 
     <string name="keyboard_theme_dark_border" translatable="false">Material Dark Border</string>
     <string name="keyboard_theme_light_border" translatable="false">Material Light Border</string>
diff --git a/app/src/main/res/xml-sw600dp/rows_hcesar.xml b/app/src/main/res/xml-sw600dp/rows_hcesar.xml
new file mode 100644
index 0000000000..8dce8c75f6
--- /dev/null
+++ b/app/src/main/res/xml-sw600dp/rows_hcesar.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <Row
+        latin:keyWidth="9.0%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hcesar1" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hcesar2" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10.0%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hcesar3" />
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <!-- Dvorak layout shares almost the same row with Qwerty layout.
+         The difference is defined in xml-sw600dp/row_qwerty4.xml. -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
diff --git a/app/src/main/res/xml/kbd_hcesar.xml b/app/src/main/res/xml/kbd_hcesar.xml
new file mode 100644
index 0000000000..3761823e91
--- /dev/null
+++ b/app/src/main/res/xml/kbd_hcesar.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<switch xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <case latin:showNumberRow="true">
+        <Keyboard
+            latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+            latin:bonusHeight="@fraction/config_key_bonus_height_5row"
+            latin:rowHeight="20%p">
+            <include latin:keyboardLayout="@xml/row_qwerty0" />
+            <include latin:keyboardLayout="@xml/rows_hcesar" />
+        </Keyboard>
+    </case>
+    <default>
+        <Keyboard>
+            <include latin:keyboardLayout="@xml/rows_hcesar" />
+        </Keyboard>
+    </default>
+</switch>
diff --git a/app/src/main/res/xml/keyboard_layout_set_hcesar.xml b/app/src/main/res/xml/keyboard_layout_set_hcesar.xml
new file mode 100644
index 0000000000..4eee76dc43
--- /dev/null
+++ b/app/src/main/res/xml/keyboard_layout_set_hcesar.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<KeyboardLayoutSet
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <Element
+        latin:elementName="alphabet"
+        latin:elementKeyboard="@xml/kbd_hcesar" />
+    <Element
+        latin:elementName="symbols"
+        latin:elementKeyboard="@xml/kbd_symbols" />
+    <Element
+        latin:elementName="symbolsShifted"
+        latin:elementKeyboard="@xml/kbd_symbols_shift" />
+    <Element
+        latin:elementName="phone"
+        latin:elementKeyboard="@xml/kbd_phone" />
+    <Element
+        latin:elementName="phoneSymbols"
+        latin:elementKeyboard="@xml/kbd_phone_symbols" />
+    <Element
+        latin:elementName="number"
+        latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
diff --git a/app/src/main/res/xml/rowkeys_hcesar1.xml b/app/src/main/res/xml/rowkeys_hcesar1.xml
new file mode 100644
index 0000000000..380f443305
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_hcesar1.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/keys_dvorak_123" />
+    <switch>
+        <case
+            latin:showNumberRow="true"
+            latin:showExtraChars="true">
+            <Key
+                latin:keySpec="h"
+                latin:keyHintLabel="_"
+                latin:additionalMoreKeys="_"
+                latin:moreKeys="!text/morekeys_h" />
+            <Key
+                latin:keySpec="c"
+                latin:keyHintLabel="\\"
+                latin:additionalMoreKeys="\\\\"
+                latin:moreKeys="!text/morekeys_c" />
+            <Key
+                latin:keySpec="e"
+                latin:keyHintLabel="|"
+                latin:additionalMoreKeys="\\|"
+                latin:moreKeys="!text/morekeys_e" />
+            <Key
+                latin:keySpec="s"
+                latin:keyHintLabel="="
+                latin:additionalMoreKeys="=" />
+            <Key
+                latin:keySpec="a"
+                latin:keyHintLabel="["
+                latin:additionalMoreKeys="!text/keyspec_left_square_bracket"
+                latin:moreKeys="!text/morekeys_a" />
+            <Key
+                latin:keySpec="r"
+                latin:keyHintLabel="]"
+                latin:additionalMoreKeys="!text/keyspec_right_square_bracket" />
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="&lt;"
+                latin:additionalMoreKeys="!text/keyspec_less_than"
+                latin:moreKeys="!text/morekeys_o" />
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="&gt;"
+                latin:additionalMoreKeys="!text/keyspec_greater_than"
+                latin:moreKeys="!text/morekeys_p" />
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="{"
+                latin:additionalMoreKeys="!text/keyspec_left_curly_bracket"
+                latin:moreKeys="!text/morekeys_z" />
+            <Key
+                latin:keySpec=","
+                latin:keyHintLabel="}"
+                latin:additionalMoreKeys="!text/keyspec_right_curly_bracket"
+                latin:moreKeys="!text/morekeys_," />
+        </case>
+        <case latin:showNumberRow="true">
+            <Key
+                latin:keySpec="h"
+                latin:moreKeys="!text/morekeys_h" />
+            <Key
+                latin:keySpec="c"
+                latin:moreKeys="!text/morekeys_c" />
+            <Key
+                latin:keySpec="e"
+                latin:moreKeys="!text/morekeys_e" />		
+            <Key
+                latin:keySpec="s" />
+            <Key
+                latin:keySpec="a"
+                latin:moreKeys="!text/morekeys_a" />
+            <Key
+                latin:keySpec="r" />
+            <Key
+                latin:keySpec="o"
+                latin:moreKeys="!text/morekeys_o" />
+            <Key
+                latin:keySpec="p"
+                latin:moreKeys="!text/morekeys_p" />
+            <Key
+                latin:keySpec="z"
+                latin:moreKeys="!text/morekeys_z" />
+            <Key
+                latin:keySpec=","
+                latin:moreKeys="!text/morekeys_," />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="h"
+                latin:keyHintLabel="1"
+                latin:additionalMoreKeys="1"
+                latin:moreKeys="!text/morekeys_h" />
+            <Key
+                latin:keySpec="c"
+                latin:keyHintLabel="2"
+                latin:additionalMoreKeys="2"
+                latin:moreKeys="!text/morekeys_c" />
+            <Key
+                latin:keySpec="e"
+                latin:keyHintLabel="3"
+                latin:additionalMoreKeys="3"
+                latin:moreKeys="!text/morekeys_e" />
+            <Key
+                latin:keySpec="s"
+                latin:keyHintLabel="4"
+                latin:additionalMoreKeys="4" />
+            <Key
+                latin:keySpec="a"
+                latin:keyHintLabel="5"
+                latin:additionalMoreKeys="5"
+                latin:moreKeys="!text/morekeys_a" />
+            <Key
+                latin:keySpec="r"
+                latin:keyHintLabel="6"
+                latin:additionalMoreKeys="6" />
+            <Key
+                latin:keySpec="o"
+                latin:keyHintLabel="7"
+                latin:additionalMoreKeys="7"
+                latin:moreKeys="!text/morekeys_o" />
+            <Key
+                latin:keySpec="p"
+                latin:keyHintLabel="8"
+                latin:additionalMoreKeys="8"
+                latin:moreKeys="!text/morekeys_p" />
+            <Key
+                latin:keySpec="z"
+                latin:keyHintLabel="9"
+                latin:additionalMoreKeys="9"
+                latin:moreKeys="!text/morekeys_z" />
+            <Key
+                latin:keySpec=","
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"
+                latin:moreKeys="!text/morekeys_," />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_hcesar2.xml b/app/src/main/res/xml/rowkeys_hcesar2.xml
new file mode 100644
index 0000000000..bcf05589cb
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_hcesar2.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <switch>
+        <case latin:showExtraChars="true">
+            <Key
+                latin:keySpec="q"
+                latin:moreKeys="!text/morekeys_q"
+                latin:keyHintLabel="\@"
+                latin:additionalMoreKeys="\@" />
+            <Key
+                latin:keySpec="t"
+                latin:moreKeys="!text/morekeys_t"
+                latin:keyHintLabel="#"
+                latin:additionalMoreKeys="#"  />
+            <Key
+                latin:keySpec="d"
+                latin:moreKeys="!text/morekeys_d"
+                latin:keyHintLabel="$"
+                latin:additionalMoreKeys="$" />
+            <Key
+                latin:keySpec="i"
+                latin:moreKeys="!text/morekeys_i"
+                latin:keyHintLabel="%"
+                latin:additionalMoreKeys="%" />
+            <Key
+                latin:keySpec="n"
+                latin:moreKeys="!text/morekeys_n"
+                latin:keyHintLabel="&amp;"
+                latin:additionalMoreKeys="&amp;" />
+            <Key
+                latin:keySpec="u"
+                latin:moreKeys="!text/morekeys_u"
+                latin:keyHintLabel="-"
+                latin:additionalMoreKeys="-" />
+            <Key
+                latin:keySpec="l"
+                latin:moreKeys="!text/morekeys_l"
+                latin:keyHintLabel="+"
+                latin:additionalMoreKeys="+" />
+            <Key
+                latin:keySpec="m"
+                latin:moreKeys="!text/morekeys_m"
+                latin:keyHintLabel="("
+                latin:additionalMoreKeys="(" />
+            <Key
+                latin:keySpec="x"
+                latin:moreKeys="!text/morekeys_x"
+                latin:keyHintLabel=")"
+                latin:additionalMoreKeys=")" />
+            <Key
+                latin:keySpec="."
+                latin:moreKeys="!text/morekeys_."
+                latin:keyHintLabel="/"
+                latin:additionalMoreKeys="/" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="q"
+                latin:moreKeys="!text/morekeys_q" />
+            <Key
+                latin:keySpec="t"
+                latin:moreKeys="!text/morekeys_t" />
+            <Key
+                latin:keySpec="d"
+                latin:moreKeys="!text/morekeys_d" />
+            <Key
+                latin:keySpec="i"
+                latin:moreKeys="!text/morekeys_i" />
+            <Key
+                latin:keySpec="n"
+                latin:moreKeys="!text/morekeys_n" />
+            <Key
+                latin:keySpec="u"
+                latin:moreKeys="!text/morekeys_u" />
+            <Key
+                latin:keySpec="l"
+                latin:moreKeys="!text/morekeys_l" />
+            <Key
+                latin:keySpec="m"
+                latin:moreKeys="!text/morekeys_m" />
+            <Key
+                latin:keySpec="x"
+                latin:moreKeys="!text/morekeys_x" />
+            <Key
+                latin:keySpec="."
+                latin:moreKeys="!text/morekeys_." />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rowkeys_hcesar3.xml b/app/src/main/res/xml/rowkeys_hcesar3.xml
new file mode 100644
index 0000000000..e8a23090bb
--- /dev/null
+++ b/app/src/main/res/xml/rowkeys_hcesar3.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <switch>
+        <case latin:showExtraChars="true">
+            <Key
+                latin:keySpec="ç"
+                latin:moreKeys="!text/morekeys_ç"
+                latin:keyHintLabel="*"
+                latin:additionalMoreKeys="*" />
+            <Key
+                latin:keySpec="j"
+                latin:moreKeys="!text/morekeys_j"
+                latin:keyHintLabel="&quot;"
+                latin:additionalMoreKeys="&quot;" />
+            <Key
+                latin:keySpec="b"
+                latin:keyHintLabel="&apos;"
+                latin:additionalMoreKeys="&apos;" />
+            <Key
+                latin:keySpec="f"
+                latin:keyHintLabel=":"
+                latin:additionalMoreKeys=":" />
+            <Key
+                latin:keySpec="v"
+                latin:keyHintLabel=";"
+                latin:additionalMoreKeys=";" />
+            <Key
+                latin:keySpec="g"
+                latin:moreKeys="!text/morekeys_g"
+                latin:keyHintLabel="!"
+                latin:additionalMoreKeys="!" />
+            <Key
+                latin:keySpec="k"
+                latin:moreKeys="!text/morekeys_k"
+                latin:keyHintLabel="\?"
+                latin:additionalMoreKeys="\?" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="ç"
+                latin:moreKeys="!text/morekeys_ç" />
+            <Key
+                latin:keySpec="j"
+                latin:moreKeys="!text/morekeys_j" />
+            <Key
+                latin:keySpec="b" />
+            <Key
+                latin:keySpec="f" />
+            <Key
+                latin:keySpec="v" />
+            <Key
+                latin:keySpec="g"
+                latin:moreKeys="!text/morekeys_g" />
+            <Key
+                latin:keySpec="k"
+                latin:moreKeys="!text/morekeys_k" />
+        </default>
+    </switch>
+</merge>
diff --git a/app/src/main/res/xml/rows_hcesar.xml b/app/src/main/res/xml/rows_hcesar.xml
new file mode 100644
index 0000000000..38e0b787d5
--- /dev/null
+++ b/app/src/main/res/xml/rows_hcesar.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hcesar1" />
+        </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_hcesar2" />
+    </Row>
+    <Row
+        latin:keyWidth="10%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="14%p" />
+        <include
+            latin:keyXPos="15%p"
+            latin:keyboardLayout="@xml/rowkeys_hcesar3" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyXPos="86%p"
+            latin:keyWidth="14%p" />
+    </Row>
+    <!-- Dvorak layout shares almost the same row with Qwerty layout.
+         The difference is defined in xml/row_qwerty4.xml. -->
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>