diff --git a/app/src/main/res/layout/fragment_introduction.xml b/app/src/main/res/layout/fragment_introduction.xml
index 4f6c52b8..75b6ca61 100644
--- a/app/src/main/res/layout/fragment_introduction.xml
+++ b/app/src/main/res/layout/fragment_introduction.xml
@@ -118,7 +118,8 @@
                                 app:ccp_countryAutoDetectionPref="SIM_NETWORK_LOCALE"
                                 app:ccp_defaultLanguage="UZBEK"
                                 app:ccp_countryPreference="pk,in,us"
-                                app:ccp_hintExampleNumber="true" />
+                                app:ccp_hintExampleNumber="true"
+                                app:ccp_defaultLanguage="AFRIKAANS"/>
 
                             <EditText
                                 android:id="@+id/et_phone"
diff --git a/ccp/src/main/java/com/hbb20/CountryCodePicker.java b/ccp/src/main/java/com/hbb20/CountryCodePicker.java
index e89d702d..0aba14a3 100644
--- a/ccp/src/main/java/com/hbb20/CountryCodePicker.java
+++ b/ccp/src/main/java/com/hbb20/CountryCodePicker.java
@@ -2125,6 +2125,7 @@ public void setHintExampleNumberType(PhoneNumberType hintExampleNumberType) {
     //add an entry for your language in attrs.xml's <attr name="language" format="enum"> enum.
     //add here so that language can be set programmatically
     public enum Language {
+        AFRIKAANS("af"),
         ARABIC("ar"),
         BENGALI("bn"),
         CHINESE_SIMPLIFIED("zh"),
diff --git a/ccp/src/main/res/raw/afrikaans.xml b/ccp/src/main/res/raw/afrikaans.xml
new file mode 100644
index 00000000..a9b5a462
--- /dev/null
+++ b/ccp/src/main/res/raw/afrikaans.xml
@@ -0,0 +1,1211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data>
+    <messages>
+        <ccp_dialog_title translation="Kies 'n land" />
+        <ccp_dialog_search_hint_message translation="Soek..." />
+        <ccp_dialog_no_result_ack_message translation='Resultate nie gevind nie' />
+    </messages>
+
+    <countries>
+        <country
+            name="Andorra"
+            english_name="Andorra"
+            name_code="ad"
+            phone_code="376" />
+        <country
+            name="Verenigde Arabiese Emirate (VAE)"
+            english_name="United Arab Emirates (UAE)"
+            name_code="ae"
+            phone_code="971" />
+        <country
+            name="Afghanistan"
+            english_name="Afghanistan"
+            name_code="af"
+            phone_code="93" />
+        <country
+            name="Antigua en Barbuda"
+            english_name="Antigua and Barbuda"
+            name_code="ag"
+            phone_code="1" />
+        <country
+            name="Anguilla"
+            english_name="Anguilla"
+            name_code="ai"
+            phone_code="1" />
+        <country
+            name="Albanië"
+            english_name="Albania"
+            name_code="al"
+            phone_code="355" />
+        <country
+            name="Armenië"
+            english_name="Armenia"
+            name_code="am"
+            phone_code="374" />
+        <country
+            name="Angola"
+            english_name="Angola"
+            name_code="ao"
+            phone_code="244" />
+        <country
+            name="Antarktika"
+            english_name="Antarctica"
+            name_code="aq"
+            phone_code="672" />
+        <country
+            name="Argentinië"
+            english_name="Argentina"
+            name_code="ar"
+            phone_code="54" />
+        <country
+            name="Amerikaans-Samoa"
+            english_name="American Samoa"
+            name_code="as"
+            phone_code="1" />
+        <country
+            name="Oostenryk"
+            english_name="Austria"
+            name_code="at"
+            phone_code="43" />
+        <country
+            name="Australië"
+            english_name="Australia"
+            name_code="au"
+            phone_code="61" />
+        <country
+            name="Aruba"
+            english_name="Aruba"
+            name_code="aw"
+            phone_code="297" />
+        <country
+            name="Alandeilande"
+            english_name="Aland Islands"
+            name_code="ax"
+            phone_code="358" />
+        <country
+            name="Azerbaijan"
+            english_name="Azerbaijan"
+            name_code="az"
+            phone_code="994" />
+        <country
+            name="Bosnië en Herzegovina"
+            english_name="Bosnia And Herzegovina"
+            name_code="ba"
+            phone_code="387" />
+        <country
+            name="Barbados"
+            english_name="Barbados"
+            name_code="bb"
+            phone_code="1" />
+        <country
+            name="Bangladesj"
+            english_name="Bangladesh"
+            name_code="bd"
+            phone_code="880" />
+        <country
+            name="België"
+            english_name="Belgium"
+            name_code="be"
+            phone_code="32" />
+        <country
+            name="Burkina Faso"
+            english_name="Burkina Faso"
+            name_code="bf"
+            phone_code="226" />
+        <country
+            name="Bulgarye"
+            english_name="Bulgaria"
+            name_code="bg"
+            phone_code="359" />
+        <country
+            name="Bahrain"
+            english_name="Bahrain"
+            name_code="bh"
+            phone_code="973" />
+        <country
+            name="Burundi"
+            english_name="Burundi"
+            name_code="bi"
+            phone_code="257" />
+        <country
+            name="Benin"
+            english_name="Benin"
+            name_code="bj"
+            phone_code="229" />
+        <country
+            name="Sint Bartolomeus"
+            english_name="Saint Barthélemy"
+            name_code="bl"
+            phone_code="590" />
+        <country
+            name="Bermuda"
+            english_name="Bermuda"
+            name_code="bm"
+            phone_code="1" />
+        <country
+            name="Brunei Darussalam"
+            english_name="Brunei Darussalam"
+            name_code="bn"
+            phone_code="673" />
+        <country
+            name="Bolivië, Plurinasionale Staat van"
+            english_name="Bolivia, Plurinational State Of"
+            name_code="bo"
+            phone_code="591" />
+        <country
+            name="Brasilië"
+            english_name="Brazil"
+            name_code="br"
+            phone_code="55" />
+        <country
+            name="Bahamas"
+            english_name="Bahamas"
+            name_code="bs"
+            phone_code="1" />
+        <country
+            name="Bhoetan"
+            english_name="Bhutan"
+            name_code="bt"
+            phone_code="975" />
+        <country
+            name="Botswana"
+            english_name="Botswana"
+            name_code="bw"
+            phone_code="267" />
+        <country
+            name="Wit-Rusland"
+            english_name="Belarus"
+            name_code="by"
+            phone_code="375" />
+        <country
+            name="Belize"
+            english_name="Belize"
+            name_code="bz"
+            phone_code="501" />
+        <country
+            name="Kanada"
+            english_name="Canada"
+            name_code="ca"
+            phone_code="1" />
+        <country
+            name="Kokoseilande"
+            english_name="Cocos (keeling) Islands"
+            name_code="cc"
+            phone_code="61" />
+        <country
+            name="Kongo, Die Demokratiese Republiek Van Die"
+            english_name="Congo, The Democratic Republic Of The"
+            name_code="cd"
+            phone_code="243" />
+        <country
+            name="Sentraal-Afrikaanse Republiek"
+            english_name="Central African Republic"
+            name_code="cf"
+            phone_code="236" />
+        <country
+            name="Kongo"
+            english_name="Congo"
+            name_code="cg"
+            phone_code="242" />
+        <country
+            name="Switserland"
+            english_name="Switzerland"
+            name_code="ch"
+            phone_code="41" />
+        <country
+            name="Ivoorkus"
+            english_name="Côte D'ivoire"
+            name_code="ci"
+            phone_code="225" />
+        <country
+            name="Cookeilande"
+            english_name="Cook Islands"
+            name_code="ck"
+            phone_code="682" />
+        <country
+            name="Chili"
+            english_name="Chile"
+            name_code="cl"
+            phone_code="56" />
+        <country
+            name="Kameroen"
+            english_name="Cameroon"
+            name_code="cm"
+            phone_code="237" />
+        <country
+            name="Sjina"
+            english_name="China"
+            name_code="cn"
+            phone_code="86" />
+        <country
+            name="Kolombië"
+            english_name="Colombia"
+            name_code="co"
+            phone_code="57" />
+        <country
+            name="Costa Rica"
+            english_name="Costa Rica"
+            name_code="cr"
+            phone_code="506" />
+        <country
+            name="Kuba"
+            english_name="Cuba"
+            name_code="cu"
+            phone_code="53" />
+        <country
+            name="Kaap Verde"
+            english_name="Cape Verde"
+            name_code="cv"
+            phone_code="238" />
+        <country
+            name="Kerseiland"
+            english_name="Christmas Island"
+            name_code="cx"
+            phone_code="61" />
+        <country
+            name="Siprus"
+            english_name="Cyprus"
+            name_code="cy"
+            phone_code="357" />
+        <country
+            name="Tsjeggiese Republiek"
+            english_name="Czech Republic"
+            name_code="cz"
+            phone_code="420" />
+        <country
+            name="Duitsland"
+            english_name="Germany"
+            name_code="de"
+            phone_code="49" />
+        <country
+            name="Djiboeti"
+            english_name="Djibouti"
+            name_code="dj"
+            phone_code="253" />
+        <country
+            name="Denemarke"
+            english_name="Denmark"
+            name_code="dk"
+            phone_code="45" />
+        <country
+            name="Dominica"
+            english_name="Dominica"
+            name_code="dm"
+            phone_code="1" />
+        <country
+            name="Dominikaanse Republiek"
+            english_name="Dominican Republic"
+            name_code="do"
+            phone_code="1" />
+        <country
+            name="Algerië"
+            english_name="Algeria"
+            name_code="dz"
+            phone_code="213" />
+        <country
+            name="Ecuador"
+            english_name="Ecuador"
+            name_code="ec"
+            phone_code="593" />
+        <country
+            name="Estland"
+            english_name="Estonia"
+            name_code="ee"
+            phone_code="372" />
+        <country
+            name="Egipte"
+            english_name="Egypt"
+            name_code="eg"
+            phone_code="20" />
+        <country
+            name="Eritrea"
+            english_name="Eritrea"
+            name_code="er"
+            phone_code="291" />
+        <country
+            name="Spanje"
+            english_name="Spain"
+            name_code="es"
+            phone_code="34" />
+        <country
+            name="Ethiopië"
+            english_name="Ethiopia"
+            name_code="et"
+            phone_code="251" />
+        <country
+            name="Finland"
+            english_name="Finland"
+            name_code="fi"
+            phone_code="358" />
+        <country
+            name="Fidji"
+            english_name="Fiji"
+            name_code="fj"
+            phone_code="679" />
+        <country
+            name="Falkland-eilande (malvinas)"
+            english_name="Falkland Islands (malvinas)"
+            name_code="fk"
+            phone_code="500" />
+        <country
+            name="Mikronesië, Gefedereerde State van"
+            english_name="Micronesia, Federated States Of"
+            name_code="fm"
+            phone_code="691" />
+        <country
+            name="Faroëreilande"
+            english_name="Faroe Islands"
+            name_code="fo"
+            phone_code="298" />
+        <country
+            name="Frankryk"
+            english_name="France"
+            name_code="fr"
+            phone_code="33" />
+        <country
+            name="Gaboen"
+            english_name="Gabon"
+            name_code="ga"
+            phone_code="241" />
+        <country
+            name="United Kingdom"
+            english_name="United Kingdom"
+            name_code="gb"
+            phone_code="44" />
+        <country
+            name="Grenada"
+            english_name="Grenada"
+            name_code="gd"
+            phone_code="1" />
+        <country
+            name="Georgia"
+            english_name="Georgia"
+            name_code="ge"
+            phone_code="995" />
+        <country
+            name="Frans-Guyana"
+            english_name="French Guyana"
+            name_code="gf"
+            phone_code="594" />
+        <country
+            name="Guernsey"
+            english_name="Guernsey"
+            name_code="gg"
+            phone_code="44" />
+        <country
+            name="Ghana"
+            english_name="Ghana"
+            name_code="gh"
+            phone_code="233" />
+        <country
+            name="Gibraltar"
+            english_name="Gibraltar"
+            name_code="gi"
+            phone_code="350" />
+        <country
+            name="Groenland"
+            english_name="Greenland"
+            name_code="gl"
+            phone_code="299" />
+        <country
+            name="Gambië"
+            english_name="Gambia"
+            name_code="gm"
+            phone_code="220" />
+        <country
+            name="Guinee"
+            english_name="Guinea"
+            name_code="gn"
+            phone_code="224" />
+        <country
+            name="Guadeloupe"
+            english_name="Guadeloupe"
+            name_code="gp"
+            phone_code="590" />
+        <country
+            name="Ekwatoriaal-Guinee"
+            english_name="Equatorial Guinea"
+            name_code="gq"
+            phone_code="240" />
+        <country
+            name="Griekeland"
+            english_name="Greece"
+            name_code="gr"
+            phone_code="30" />
+        <country
+            name="Guatemala"
+            english_name="Guatemala"
+            name_code="gt"
+            phone_code="502" />
+        <country
+            name="Guam"
+            english_name="Guam"
+            name_code="gu"
+            phone_code="1" />
+        <country
+            name="Guinee-Bissau"
+            english_name="Guinea-bissau"
+            name_code="gw"
+            phone_code="245" />
+        <country
+            name="Guyana"
+            english_name="Guyana"
+            name_code="gy"
+            phone_code="592" />
+        <country
+            name="Hongkong"
+            english_name="Hong Kong"
+            name_code="hk"
+            phone_code="852" />
+        <country
+            name="Honduras"
+            english_name="Honduras"
+            name_code="hn"
+            phone_code="504" />
+        <country
+            name="Kroasië"
+            english_name="Croatia"
+            name_code="hr"
+            phone_code="385" />
+        <country
+            name="Haïti"
+            english_name="Haiti"
+            name_code="ht"
+            phone_code="509" />
+        <country
+            name="Hongarye"
+            english_name="Hungary"
+            name_code="hu"
+            phone_code="36" />
+        <country
+            name="Indonesië"
+            english_name="Indonesia"
+            name_code="id"
+            phone_code="62" />
+        <country
+            name="Ierland"
+            english_name="Ireland"
+            name_code="ie"
+            phone_code="353" />
+        <country
+            name="Israel"
+            english_name="Israel"
+            name_code="il"
+            phone_code="972" />
+        <country
+            name="Eiland Man"
+            english_name="Isle Of Man"
+            name_code="im"
+            phone_code="44" />
+        <country
+            name="Ysland"
+            english_name="Iceland"
+            name_code="is"
+            phone_code="354" />
+        <country
+            name="Indië"
+            english_name="India"
+            name_code="in"
+            phone_code="91" />
+        <country
+            name="Britse Indiese Oseaan Gebied"
+            english_name="British Indian Ocean Territory"
+            name_code="io"
+            phone_code="246" />
+        <country
+            name="Irak"
+            english_name="Iraq"
+            name_code="iq"
+            phone_code="964" />
+        <country
+            name="Iran, Islamitiese Republiek van"
+            english_name="Iran, Islamic Republic Of"
+            name_code="ir"
+            phone_code="98" />
+        <country
+            name="Italië"
+            english_name="Italy"
+            name_code="it"
+            phone_code="39" />
+        <country
+            name="Jersey"
+            english_name="Jersey"
+            name_code="je"
+            phone_code="44" />
+        <country
+            name="Jamaika"
+            english_name="Jamaica"
+            name_code="jm"
+            phone_code="1" />
+        <country
+            name="Jordan"
+            english_name="Jordan"
+            name_code="jo"
+            phone_code="962" />
+        <country
+            name="Japan"
+            english_name="Japan"
+            name_code="jp"
+            phone_code="81" />
+        <country
+            name="Kenia"
+            english_name="Kenya"
+            name_code="ke"
+            phone_code="254" />
+        <country
+            name="Kirgisië"
+            english_name="Kyrgyzstan"
+            name_code="kg"
+            phone_code="996" />
+        <country
+            name="Kambodja"
+            english_name="Cambodia"
+            name_code="kh"
+            phone_code="855" />
+        <country
+            name="Kiribati"
+            english_name="Kiribati"
+            name_code="ki"
+            phone_code="686" />
+        <country
+            name="Comore-eilande"
+            english_name="Comoros"
+            name_code="km"
+            phone_code="269" />
+        <country
+            name="Sint Kitts en Nevis"
+            english_name="Saint Kitts and Nevis"
+            name_code="kn"
+            phone_code="1" />
+        <country
+            name="Noord-Korea"
+            english_name="North Korea"
+            name_code="kp"
+            phone_code="850" />
+        <country
+            name="TSuid-Korea"
+            english_name="South Korea"
+            name_code="kr"
+            phone_code="82" />
+        <country
+            name="Koeweit"
+            english_name="Kuwait"
+            name_code="kw"
+            phone_code="965" />
+        <country
+            name="Kaaimanseilande"
+            english_name="Cayman Islands"
+            name_code="ky"
+            phone_code="1" />
+        <country
+            name="Kasakstan"
+            english_name="Kazakhstan"
+            name_code="kz"
+            phone_code="7" />
+        <country
+            name="Laos Demokratiese Volksrepubliek "
+            english_name="Lao People's Democratic Republic"
+            name_code="la"
+            phone_code="856" />
+        <country
+            name="Libanon"
+            english_name="Lebanon"
+            name_code="lb"
+            phone_code="961" />
+        <country
+            name="Sint-Lucia"
+            english_name="Saint Lucia"
+            name_code="lc"
+            phone_code="1" />
+        <country
+            name="Liechtenstein"
+            english_name="Liechtenstein"
+            name_code="li"
+            phone_code="423" />
+        <country
+            name="Sri Lanka"
+            english_name="Sri Lanka"
+            name_code="lk"
+            phone_code="94" />
+        <country
+            name="Liberië"
+            english_name="Liberia"
+            name_code="lr"
+            phone_code="231" />
+        <country
+            name="Lesotho"
+            english_name="Lesotho"
+            name_code="ls"
+            phone_code="266" />
+        <country
+            name="Litaue"
+            english_name="Lithuania"
+            name_code="lt"
+            phone_code="370" />
+        <country
+            name="Luxembourg"
+            english_name="Luxembourg"
+            name_code="lu"
+            phone_code="352" />
+        <country
+            name="Letland"
+            english_name="Latvia"
+            name_code="lv"
+            phone_code="371" />
+        <country
+            name="Libië"
+            english_name="Libya"
+            name_code="ly"
+            phone_code="218" />
+        <country
+            name="Marokko"
+            english_name="Morocco"
+            name_code="ma"
+            phone_code="212" />
+        <country
+            name="Monaco"
+            english_name="Monaco"
+            name_code="mc"
+            phone_code="377" />
+        <country
+            name="Moldawië, Republiek Van"
+            english_name="Moldova, Republic Of"
+            name_code="md"
+            phone_code="373" />
+        <country
+            name="Montenegro"
+            english_name="Montenegro"
+            name_code="me"
+            phone_code="382" />
+        <country
+            name="Sint-Martin"
+            english_name="Saint Martin"
+            name_code="mf"
+            phone_code="590" />
+        <country
+            name="Madagaskar"
+            english_name="Madagascar"
+            name_code="mg"
+            phone_code="261" />
+        <country
+            name="Marshalleilande"
+            english_name="Marshall Islands"
+            name_code="mh"
+            phone_code="692" />
+        <country
+            name="Masedonië, die Voormalige Joego Slawiese Republiek van"
+            english_name="Macedonia, The Former Yugoslav Republic Of"
+            name_code="mk"
+            phone_code="389" />
+        <country
+            name="Mali"
+            english_name="Mali"
+            name_code="ml"
+            phone_code="223" />
+        <country
+            name="Mianmar"
+            english_name="Myanmar"
+            name_code="mm"
+            phone_code="95" />
+        <country
+            name="Mongolië"
+            english_name="Mongolia"
+            name_code="mn"
+            phone_code="976" />
+        <country
+            name="Macau"
+            english_name="Macao"
+            name_code="mo"
+            phone_code="853" />
+        <country
+            name="Noordelike Mariana-eilande"
+            english_name="Northern Mariana Islands"
+            name_code="mp"
+            phone_code="1" />
+        <country
+            name="Martinique"
+            english_name="Martinique"
+            name_code="mq"
+            phone_code="596" />
+        <country
+            name="Mauritanië"
+            english_name="Mauritania"
+            name_code="mr"
+            phone_code="222" />
+        <country
+            name="Montserrat"
+            english_name="Montserrat"
+            name_code="ms"
+            phone_code="1" />
+        <country
+            name="Malta"
+            english_name="Malta"
+            name_code="mt"
+            phone_code="356" />
+        <country
+            name="Mauritius"
+            english_name="Mauritius"
+            name_code="mu"
+            phone_code="230" />
+        <country
+            name="Maledive"
+            english_name="Maldives"
+            name_code="mv"
+            phone_code="960" />
+        <country
+            name="Malawi"
+            english_name="Malawi"
+            name_code="mw"
+            phone_code="265" />
+        <country
+            name="Meksiko"
+            english_name="Mexico"
+            name_code="mx"
+            phone_code="52" />
+        <country
+            name="Maleisië"
+            english_name="Malaysia"
+            name_code="my"
+            phone_code="60" />
+        <country
+            name="Mosambiek"
+            english_name="Mozambique"
+            name_code="mz"
+            phone_code="258" />
+        <country
+            name="Namibië"
+            english_name="Namibia"
+            name_code="na"
+            phone_code="264" />
+        <country
+            name="Nieu-Kaledonië"
+            english_name="New Caledonia"
+            name_code="nc"
+            phone_code="687" />
+        <country
+            name="Niger"
+            english_name="Niger"
+            name_code="ne"
+            phone_code="227" />
+        <country
+            name="Norfolkeiland"
+            english_name="Norfolk Islands"
+            name_code="nf"
+            phone_code="672" />
+        <country
+            name="Nigerië"
+            english_name="Nigeria"
+            name_code="ng"
+            phone_code="234" />
+        <country
+            name="Nicaragua"
+            english_name="Nicaragua"
+            name_code="ni"
+            phone_code="505" />
+        <country
+            name="Nederland"
+            english_name="Netherlands"
+            name_code="nl"
+            phone_code="31" />
+        <country
+            name="Noorweë"
+            english_name="Norway"
+            name_code="no"
+            phone_code="47" />
+        <country
+            name="Nepal"
+            english_name="Nepal"
+            name_code="np"
+            phone_code="977" />
+        <country
+            name="Nauru"
+            english_name="Nauru"
+            name_code="nr"
+            phone_code="674" />
+        <country
+            name="Niue"
+            english_name="Niue"
+            name_code="nu"
+            phone_code="683" />
+        <country
+            name="Nieu-Seeland"
+            english_name="New Zealand"
+            name_code="nz"
+            phone_code="64" />
+        <country
+            name="Oman"
+            english_name="Oman"
+            name_code="om"
+            phone_code="968" />
+        <country
+            name="Panama"
+            english_name="Panama"
+            name_code="pa"
+            phone_code="507" />
+        <country
+            name="Peru"
+            english_name="Peru"
+            name_code="pe"
+            phone_code="51" />
+        <country
+            name="Frans-Polynesië"
+            english_name="French Polynesia"
+            name_code="pf"
+            phone_code="689" />
+        <country
+            name="Papoea-Nieu-Guinee"
+            english_name="Papua New Guinea"
+            name_code="pg"
+            phone_code="675" />
+        <country
+            name="Filippyne"
+            english_name="Philippines"
+            name_code="ph"
+            phone_code="63" />
+        <country
+            name="Pakistan"
+            english_name="Pakistan"
+            name_code="pk"
+            phone_code="92" />
+        <country
+            name="Pole"
+            english_name="Poland"
+            name_code="pl"
+            phone_code="48" />
+        <country
+            name="Sint Pierre en Miquelon"
+            english_name="Saint Pierre And Miquelon"
+            name_code="pm"
+            phone_code="508" />
+        <country
+            name="Pitcairneilande"
+            english_name="Pitcairn"
+            name_code="pn"
+            phone_code="870" />
+        <country
+            name="Puerto Rico"
+            english_name="Puerto Rico"
+            name_code="pr"
+            phone_code="1" />
+        <country
+            name="Palestina"
+            english_name="Palestine"
+            name_code="ps"
+            phone_code="970" />
+        <country
+            name="Portugal"
+            english_name="Portugal"
+            name_code="pt"
+            phone_code="351" />
+        <country
+            name="Palau"
+            english_name="Palau"
+            name_code="pw"
+            phone_code="680" />
+        <country
+            name="Paraguay"
+            english_name="Paraguay"
+            name_code="py"
+            phone_code="595" />
+        <country
+            name="Katar"
+            english_name="Qatar"
+            name_code="qa"
+            phone_code="974" />
+        <country
+            name="Réunion"
+            english_name="Réunion"
+            name_code="re"
+            phone_code="262" />
+        <country
+            name="Roemenië"
+            english_name="Romania"
+            name_code="ro"
+            phone_code="40" />
+        <country
+            name="Serwië"
+            english_name="Serbia"
+            name_code="rs"
+            phone_code="381" />
+        <country
+            name="Russiese Federasie"
+            english_name="Russian Federation"
+            name_code="ru"
+            phone_code="7" />
+        <country
+            name="Rwanda"
+            english_name="Rwanda"
+            name_code="rw"
+            phone_code="250" />
+        <country
+            name="Saoedi-Arabië"
+            english_name="Saudi Arabia"
+            name_code="sa"
+            phone_code="966" />
+        <country
+            name="Salomonseilande"
+            english_name="Solomon Islands"
+            name_code="sb"
+            phone_code="677" />
+        <country
+            name="Seychelle"
+            english_name="Seychelles"
+            name_code="sc"
+            phone_code="248" />
+        <country
+            name="Soedan"
+            english_name="Sudan"
+            name_code="sd"
+            phone_code="249" />
+        <country
+            name="Swede"
+            english_name="Sweden"
+            name_code="se"
+            phone_code="46" />
+        <country
+            name="Singapoer"
+            english_name="Singapore"
+            name_code="sg"
+            phone_code="65" />
+        <country
+            name="Sint Helena, Ascension en Tristan da Cunha"
+            english_name="Saint Helena, Ascension And Tristan Da Cunha"
+            name_code="sh"
+            phone_code="290" />
+        <country
+            name="Slowenië"
+            english_name="Slovenia"
+            name_code="si"
+            phone_code="386" />
+        <country
+            name="Slowakye"
+            english_name="Slovakia"
+            name_code="sk"
+            phone_code="421" />
+        <country
+            name="Sierra Leone"
+            english_name="Sierra Leone"
+            name_code="sl"
+            phone_code="232" />
+        <country
+            name="San Marino"
+            english_name="San Marino"
+            name_code="sm"
+            phone_code="378" />
+        <country
+            name="Senegal"
+            english_name="Senegal"
+            name_code="sn"
+            phone_code="221" />
+        <country
+            name="Somalië"
+            english_name="Somalia"
+            name_code="so"
+            phone_code="252" />
+        <country
+            name="Suriname"
+            english_name="Suriname"
+            name_code="sr"
+            phone_code="597" />
+        <country
+            name="São Tomé en Príncipe"
+            english_name="Sao Tome And Principe"
+            name_code="st"
+            phone_code="239" />
+        <country
+            name="El Salvador"
+            english_name="El Salvador"
+            name_code="sv"
+            phone_code="503" />
+        <country
+            name="Sint Maarten"
+            english_name="Sint Maarten"
+            name_code="sx"
+            phone_code="1" />
+        <country
+            name="Sirië, Arabiese Republiek"
+            english_name="Syrian Arab Republic"
+            name_code="sy"
+            phone_code="963" />
+        <country
+            name="Swaziland"
+            english_name="Swaziland"
+            name_code="sz"
+            phone_code="268" />
+        <country
+            name="Turks- en Caicoseilande"
+            english_name="Turks and Caicos Islands"
+            name_code="tc"
+            phone_code="1" />
+        <country
+            name="Tsjad"
+            english_name="Chad"
+            name_code="td"
+            phone_code="235" />
+        <country
+            name="Togo"
+            english_name="Togo"
+            name_code="tg"
+            phone_code="228" />
+        <country
+            name="Thailand"
+            english_name="Thailand"
+            name_code="th"
+            phone_code="66" />
+        <country
+            name="Tadjikistan"
+            english_name="Tajikistan"
+            name_code="tj"
+            phone_code="992" />
+        <country
+            name="Tokelau"
+            english_name="Tokelau"
+            name_code="tk"
+            phone_code="690" />
+        <country
+            name="Oos-Timor"
+            english_name="Timor-leste"
+            name_code="tl"
+            phone_code="670" />
+        <country
+            name="Turkmenistan"
+            english_name="Turkmenistan"
+            name_code="tm"
+            phone_code="993" />
+        <country
+            name="Tunisië"
+            english_name="Tunisia"
+            name_code="tn"
+            phone_code="216" />
+        <country
+            name="Tonga"
+            english_name="Tonga"
+            name_code="to"
+            phone_code="676" />
+        <country
+            name="Turkye"
+            english_name="Turkey"
+            name_code="tr"
+            phone_code="90" />
+        <country
+            name="Trinidad en Tobago"
+            english_name="Trinidad &amp; Tobago"
+            name_code="tt"
+            phone_code="1" />
+        <country
+            name="Tuvalu"
+            english_name="Tuvalu"
+            name_code="tv"
+            phone_code="688" />
+        <country
+            name="Taiwan"
+            english_name="Taiwan"
+            name_code="tw"
+            phone_code="886" />
+        <country
+            name="Tanzanië, Verenigde Republiek Van"
+            english_name="Tanzania, United Republic Of"
+            name_code="tz"
+            phone_code="255" />
+        <country
+            name="Oekraïne"
+            english_name="Ukraine"
+            name_code="ua"
+            phone_code="380" />
+        <country
+            name="Uganda"
+            english_name="Uganda"
+            name_code="ug"
+            phone_code="256" />
+        <country
+            name="Verenigde State (VSA)"
+            english_name="United States (USA)"
+            name_code="us"
+            phone_code="1" />
+        <country
+            name="Uruguay"
+            english_name="Uruguay"
+            name_code="uy"
+            phone_code="598" />
+        <country
+            name="Oesbekistan"
+            english_name="Uzbekistan"
+            name_code="uz"
+            phone_code="998" />
+        <country
+            name="Vatikaanstad"
+            english_name="Holy See (vatican City State)"
+            name_code="va"
+            phone_code="379" />
+        <country
+            name="Sint Vincent en die Grenadine"
+            english_name="Saint Vincent &amp; The Grenadines"
+            name_code="vc"
+            phone_code="1" />
+        <country
+            name="Venezuela, Bolivariaanse Republiek van "
+            english_name="Venezuela, Bolivarian Republic Of"
+            name_code="ve"
+            phone_code="58" />
+        <country
+            name="Britse Maagde-eilande"
+            english_name="British Virgin Islands"
+            name_code="vg"
+            phone_code="1" />
+        <country
+            name="Amerikaanse Maagde-eilande"
+            english_name="US Virgin Islands"
+            name_code="vi"
+            phone_code="1" />
+        <country
+            name="Viëtnam"
+            english_name="Viet Nam"
+            name_code="vn"
+            phone_code="84" />
+        <country
+            name="Vanuatu"
+            english_name="Vanuatu"
+            name_code="vu"
+            phone_code="678" />
+        <country
+            name="Wallis En Futuna"
+            english_name="Wallis And Futuna"
+            name_code="wf"
+            phone_code="681" />
+        <country
+            name="Samoa"
+            english_name="Samoa"
+            name_code="ws"
+            phone_code="685" />
+        <country
+            name="Kosovo"
+            english_name="Kosovo"
+            name_code="xk"
+            phone_code="383" />
+        <country
+            name="Jemen"
+            english_name="Yemen"
+            name_code="ye"
+            phone_code="967" />
+        <country
+            name="Mayotte"
+            english_name="Mayotte"
+            name_code="yt"
+            phone_code="262" />
+        <country
+            name="Suid-Afrika"
+            english_name="South Africa"
+            name_code="za"
+            phone_code="27" />
+        <country
+            name="Zambië"
+            english_name="Zambia"
+            name_code="zm"
+            phone_code="260" />
+        <country
+            name="Zimbabwe"
+            english_name="Zimbabwe"
+            name_code="zw"
+            phone_code="263" />
+    </countries>
+</data>
diff --git a/ccp/src/main/res/values/attrs.xml b/ccp/src/main/res/values/attrs.xml
index 95f22eb0..27d619ae 100644
--- a/ccp/src/main/res/values/attrs.xml
+++ b/ccp/src/main/res/values/attrs.xml
@@ -67,33 +67,34 @@
         <!--list of languages-->
         <!--Make sure: order in this list must match order of Language Enum in CountryCodePicker.java. Values must be ascending starting from 0.-->
         <attr name="ccp_defaultLanguage" format="enum">
-            <enum name="ARABIC" value="0" />
-            <enum name="BENGALI" value="1" />
-            <enum name="CHINESE_SIMPLIFIED" value="2" />
-            <enum name="CHINESE_TRADITIONAL" value="3" />
-            <enum name="CZECH" value="4" />
-            <enum name="DUTCH" value="5" />
-            <enum name="ENGLISH" value="6" />
-            <enum name="FARSI" value="7" />
-            <enum name="FRENCH" value="8" />
-            <enum name="GERMAN" value="9" />
-            <enum name="GUJARATI" value="10" />
-            <enum name="HEBREW" value="11" />
-            <enum name="HINDI" value="12" />
-            <enum name="INDONESIA" value="1" />
-            <enum name="ITALIAN" value = "143"/>
-            <enum name="JAPANESE" value="15" />
-            <enum name="KOREAN" value="1" />
-            <enum name="POLISH" value="176"/>
-            <enum name="PORTUGUESE" value="18" />
-            <enum name="PUNJABI" value="19" />
-            <enum name="RUSSIAN" value="20" />
-            <enum name="SLOVAK" value="21" />
-            <enum name="SPANISH" value="22" />
-            <enum name="SWEDISH" value="23" />
-            <enum name="TURKISH" value="24" />
-            <enum name="UKRAINIAN" value="25" />
-            <enum name="UZBEK" value="26" />
+						<enum name="AFRIKAANS" value="0"/>
+            <enum name="ARABIC" value="1"/>
+            <enum name="BENGALI" value="2"/>
+            <enum name="CHINESE_SIMPLIFIED" value="3"/>
+            <enum name="CHINESE_TRADITIONAL" value="4" />
+         		<enum name="CZECH" value="5" />
+						<enum name="DUTCH" value="6" />
+            <enum name="ENGLISH" value="7" />
+            <enum name="FARSI" value="8" />
+            <enum name="FRENCH" value="9" />
+            <enum name="GERMAN" value="10" />
+            <enum name="GUJARATI" value="11" />
+            <enum name="HEBREW" value="12" />
+            <enum name="HINDI" value="13" />
+						<enum name="INDONESIA" value="14" />
+            <enum name="ITALIAN" value = "15"/>
+            <enum name="JAPANESE" value="16" />
+            <enum name="KOREAN" value="17" />
+            <enum name="POLISH" value="18"/>
+						<enum name="PORTUGUESE" value="19" />
+            <enum name="PUNJABI" value="20" />
+            <enum name="RUSSIAN" value="21" />
+            <enum name="SLOVAK" value="22" />
+            <enum name="SPANISH" value="23" />
+            <enum name="SWEDISH" value="24" />
+            <enum name="TURKISH" value="25" />
+            <enum name="UKRAINIAN" value="26" />
+						<enum name="UZBEK" value="27" />
         </attr>
 
         <attr name="ccp_countryAutoDetectionPref" format="enum">