diff --git a/src/includes/class.lang.php b/src/includes/class.lang.php
index ae2ac2d..4dc3d59 100644
--- a/src/includes/class.lang.php
+++ b/src/includes/class.lang.php
@@ -101,8 +101,8 @@ class Lang
 
     function rtl()
     {
-        if ( isset($this->strings['_rtl']) ) {
-            return intval($this->strings['_rtl']);
+        if ( isset($this->strings['_header']['rtl']) ) {
+            return intval($this->strings['_header']['rtl']);
         }
         return 0;
     }
@@ -191,14 +191,9 @@ class Lang
         if (!$lang) {
             return;
         }
-
         if (isset($lang['_header'])) {
             unset($lang['_header']);
         }
-        if (isset($lang['_ltr'])) {
-            unset($lang['_ltr']);
-        }
-
         $this->strings = array_replace($this->strings, $lang);
     }
 
diff --git a/src/includes/lang/ar.json b/src/includes/lang/ar.json
index b9776f6..6d8294c 100644
--- a/src/includes/lang/ar.json
+++ b/src/includes/lang/ar.json
@@ -5,9 +5,9 @@
         "language": "Arabic",
         "original_name": "عربي",
         "author": "Majid Al-Dharrab",
-        "author_email": "majid@aldharrab.com"
+        "author_email": "majid@aldharrab.com",
+        "rtl": 1
     },
-    "_rtl": 1,
     "My Tiny Todolist": "My Tiny Todolist",
     "htab_newtask": "مهمة جديدة",
     "htab_search": "بحث",
diff --git a/src/includes/lang/en-rtl.json b/src/includes/lang/en-rtl.json
index eab97d8..a368953 100644
--- a/src/includes/lang/en-rtl.json
+++ b/src/includes/lang/en-rtl.json
@@ -5,7 +5,7 @@
         "language": "English (for RTL test)",
         "original_name": "English RTL",
         "author": "Max Pozdeev",
-        "author_url": "http://www.mytinytodo.net"
-    },
-	"_rtl": 1
-}
\ No newline at end of file
+        "author_url": "http://www.mytinytodo.net",
+        "rtl": 1
+    }
+}
diff --git a/src/includes/lang/fa.json b/src/includes/lang/fa.json
index 4903c35..9ed0a62 100644
--- a/src/includes/lang/fa.json
+++ b/src/includes/lang/fa.json
@@ -5,9 +5,9 @@
         "language": "Persian",
         "original_name": "فارسی",
         "author": "Mostafa Khademolmele",
-        "author_url": "http://www.nemov.ir"
+        "author_url": "http://www.nemov.ir",
+        "rtl": 1
     },
-    "_rtl": 1,
     "My Tiny Todolist": "مدیریت وظایف",
     "htab_newtask": "وظیفه جدید",
     "htab_search": "جستجو",
diff --git a/src/includes/lang/he.json b/src/includes/lang/he.json
index d34208b..b7a9319 100644
--- a/src/includes/lang/he.json
+++ b/src/includes/lang/he.json
@@ -5,9 +5,9 @@
         "language": "Hebrew",
         "original_name": "עברית",
         "author": "Ohad Raz",
-        "author_url": "http://www.Bainternet.info"
+        "author_url": "http://www.Bainternet.info",
+        "rtl": 1
     },
-    "_rtl": 1,
     "My Tiny Todolist": "My Tiny Todolist",
     "htab_newtask": "משימה חדשה",
     "htab_search": "חיפוש",