Index: wp-content/themes/twentyeleven/inc/images/content-sidebar.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: wp-content/themes/twentyeleven/inc/images/sidebar-content.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: wp-content/themes/twentyeleven/inc/theme-options.php
===================================================================
--- wp-content/themes/twentyeleven/inc/theme-options.php	(revision 18338)
+++ wp-content/themes/twentyeleven/inc/theme-options.php	(working copy)
@@ -133,15 +133,15 @@
  */
 function twentyeleven_layouts() {
 	$layout_options = array(
-		'content-sidebar' => array(
-			'value' => 'content-sidebar',
+		'right-sidebar' => array(
+			'value' => 'right-sidebar',
 			'label' => __( 'Content on left', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/content-sidebar.png',
+			'thumbnail' => get_template_directory_uri() . '/inc/images/right-sidebar.png',
 		),
-		'sidebar-content' => array(
-			'value' => 'sidebar-content',
+		'left-sidebar' => array(
+			'value' => 'left-sidebar',
 			'label' => __( 'Content on right', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/sidebar-content.png',
+			'thumbnail' => get_template_directory_uri() . '/inc/images/left-sidebar.png',
 		),
 		'content' => array(
 			'value' => 'content',
@@ -162,9 +162,12 @@
 	$default_theme_options = array(
 		'color_scheme' => 'light',
 		'link_color'   => twentyeleven_get_default_link_color( 'light' ),
-		'theme_layout' => 'content-sidebar',
+		'theme_layout' => 'right-sidebar'
 	);
 
+	if ( is_rtl() )
+		$default_theme_options['theme_layout'] = 'left-sidebar';
+
 	return apply_filters( 'twentyeleven_default_theme_options', $default_theme_options );
 }
 
@@ -386,7 +389,7 @@
 	$options = twentyeleven_get_theme_options();
 	$current_layout = $options['theme_layout'];
 
-	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
+	if ( in_array( $current_layout, array( 'right-sidebar', 'left-sidebar' ) ) )
 		$classes = array( 'two-column' );
 	else
 		$classes = array( 'one-column' );
@@ -397,4 +400,4 @@
 
 	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 18338)
+++ 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 18338)
+++ 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;