3 files changed, 22 insertions, 2 deletions

diff --git a/utils/themeeditor/gui/devicestate.cpp b/utils/themeeditor/gui/devicestate.cpp
index fda2bddbe5..d87cd70f2c 100644
--- a/utils/themeeditor/gui/devicestate.cpp
+++ b/utils/themeeditor/gui/devicestate.cpp
@@ -46,7 +46,6 @@ DeviceState::DeviceState(QWidget *parent) :
 
     /* Loading the tabs */
     QScrollArea* currentArea = 0;
-    QHBoxLayout* subLayout;
     QWidget* panel;
 
     QFile fin(":/resources/deviceoptions");
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp
index 1ce3d098b9..25cae58762 100644
--- a/utils/themeeditor/models/parsetreenode.cpp
+++ b/utils/themeeditor/models/parsetreenode.cpp
@@ -616,6 +616,26 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
             /* %ar */
             viewport->alignText(RBViewport::Right);
             return true;
+
+        case 'x':
+            /* %ax */
+            return true;
+
+        case 'L':
+            /* %aL */
+            if(info.device()->data("rtl").toBool())
+                viewport->alignText(RBViewport::Right);
+            else
+                viewport->alignText(RBViewport::Left);
+            return true;
+
+        case 'R':
+            /* %aR */
+            if(info.device()->data("rtl").toBool())
+                viewport->alignText(RBViewport::Left);
+            else
+                viewport->alignText(RBViewport::Right);
+            return true;
         }
 
         return false;
@@ -811,7 +831,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
         case '\0':
             /* %X */
             filename = QString(element->params[0].data.text);
-            if(info.sbsScreen())
+            if(info.sbsScreen() && info.screen()->parentItem())
                 info.sbsScreen()->setBackdrop(filename);
             else
                 info.screen()->setBackdrop(filename);
diff --git a/utils/themeeditor/resources/deviceoptions b/utils/themeeditor/resources/deviceoptions
index d7dddb4c13..fa7885d9a5 100644
--- a/utils/themeeditor/resources/deviceoptions
+++ b/utils/themeeditor/resources/deviceoptions
@@ -37,6 +37,7 @@ remotewidth ; Remote Width ; spin(0,800) ; 100
 remoteheight ; Remote Height ; spin(0,800); 50
 showviewports ; Show Viewports ; check ; false
 rendersbs ; Render SBS If Available ; check ; true
+rtl ; Right-To-Left Language ; check ; false
 
 [ID3 Info]
 ia ; Artist ; text ; Current Artist