Index: wp-content/themes/twentyeleven/inc/theme-options.php
===================================================================
--- wp-content/themes/twentyeleven/inc/theme-options.php	(revision 18341)
+++ wp-content/themes/twentyeleven/inc/theme-options.php	(working copy)
@@ -391,10 +391,15 @@
 	else
 		$classes = array( 'one-column' );
 
-	$classes[] = $current_layout;
+	if ( 'content-sidebar' == $current_layout )
+		$classes[] = 'right-sidebar';
+	elseif ( 'sidebar-content' == $current_layout )
+		$classes[] = 'left-sidebar';
+	else
+		$classes[] = $current_layout;
 
 	$classes = apply_filters( 'twentyeleven_layout_classes', $classes, $current_layout );
 
 	return array_merge( $existing_classes, $classes );
 }
-add_filter( 'body_class', 'twentyeleven_layout_classes' );
\ No newline at end of file
+add_filter( 'body_class', 'twentyeleven_layout_classes' );
Index: wp-content/themes/twentyeleven/rtl.css
===================================================================
--- wp-content/themes/twentyeleven/rtl.css	(revision 18341)
+++ wp-content/themes/twentyeleven/rtl.css	(working copy)
@@ -27,7 +27,14 @@
 	padding-left: 0;
 }
 
+#site-title {
+    margin-right: 0;
+}
 
+#site-description {
+    margin: 0 0 3.65625em;
+}
+
 /* =Menu
 -------------------------------------------------------------- */
 
@@ -59,7 +66,6 @@
 #branding #s {
 	float: left;
 	padding: 4px 28px 4px 10px;
-	width: 8%;
 }
 #branding #s:focus {
 	width: 26%;
Index: wp-content/themes/twentyeleven/style.css
===================================================================
--- wp-content/themes/twentyeleven/style.css	(revision 18341)
+++ wp-content/themes/twentyeleven/style.css	(working copy)
@@ -101,7 +101,7 @@
 	margin: 0;
 }
 .singular #content,
-.sidebar-content.singular #content {
+.left-sidebar.singular #content {
 	margin: 0 7.6%;
 	position: relative;
 	width: auto;
@@ -126,11 +126,11 @@
 
 /* Showcase */
 .page-template-showcase-php #primary,
-.sidebar-content.page-template-showcase-php #primary {
+.left-sidebar.page-template-showcase-php #primary {
 	margin: 0;
 }
 .page-template-showcase-php #content,
-.sidebar-content.page-template-showcase-php #content {
+.left-sidebar.page-template-showcase-php #content {
 	margin: 0 7.6%;
 	width: auto;
 }
@@ -174,16 +174,16 @@
 }
 
 /* Right Content */
-.sidebar-content #primary {
+.left-sidebar #primary {
 	float: right;
 	margin: 0 0 0 -26.4%;
 	width: 100%;
 }
-.sidebar-content #content {
+.left-sidebar #content {
 	margin: 0 7.6% 0 34%;
 	width: 58.4%;
 }
-.sidebar-content #secondary {
+.left-sidebar #secondary {
 	float: left;
 	margin-left: 7.6%;
 	margin-right: 0;