diff --git a/lib/editor/atto/plugins/table/lang/en/atto_table.php b/lib/editor/atto/plugins/table/lang/en/atto_table.php
index 3a8abc3573f..0daa66a8acb 100644
--- a/lib/editor/atto/plugins/table/lang/en/atto_table.php
+++ b/lib/editor/atto/plugins/table/lang/en/atto_table.php
@@ -26,17 +26,9 @@ $string['addcolumnafter'] = 'Insert column after';
 $string['addrowafter'] = 'Insert row after';
 $string['all'] = 'Around each cell';
 $string['allowbackgroundcolour'] = 'Allow background colour';
-$string['allowbackgroundcolour_desc'] = 'Allow users to set the background colour for the table';
-$string['allowborder'] = 'Allow borders';
-$string['allowborder_desc'] = 'If enabled, table and cell borders can be customised. The default border is a solid, 1px, black line.';
-$string['allowborderstyle'] = 'Allow border styling';
-$string['allowborderstyle_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.';
-$string['allowbordersize'] = 'Allow border size control';
-$string['allowbordersize_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.';
-$string['allowbordercolour'] = 'Allow border colour';
-$string['allowbordercolour_desc'] = 'This setting has no effect unless \'Allow borders\' is enabled.';
+$string['allowborder'] = 'Allow border styling';
+$string['allowborder_desc'] = 'If enabled, table and cell borders can be customised.';
 $string['allowwidth'] = 'Allow width';
-$string['allowwidth_desc'] = 'Allow users to set the width of the tables.';
 $string['appearance'] = 'Appearance';
 $string['backgroundcolour'] = 'Background colour';
 $string['both'] = 'Both';
@@ -44,7 +36,6 @@ $string['bordercolour'] = 'Border colour';
 $string['borders'] = 'Borders';
 $string['bordersize'] = 'Size of borders';
 $string['borderstyles'] = 'Style of borders';
-$string['borderstyles_desc'] = 'Allowed border styles, separated by commas';
 $string['caption'] = 'Caption';
 $string['captionposition'] = 'Caption position';
 $string['columns'] = 'Columns';
@@ -53,14 +44,8 @@ $string['deletecolumn'] = 'Delete column';
 $string['deleterow'] = 'Delete row';
 $string['dashed'] = 'Dashed';
 $string['dotted'] = 'Dotted';
-$string['double'] = 'Double';
 $string['edittable'] = 'Edit table';
-$string['groove'] = 'Groove';
 $string['headers'] = 'Define headers on';
-$string['hidden'] = 'Hidden';
-$string['inherit'] = 'Inherit';
-$string['initial'] = 'Initial';
-$string['inset'] = 'Inset';
 $string['movecolumnleft'] = 'Move column left';
 $string['movecolumnright'] = 'Move column right';
 $string['moverowdown'] = 'Move row down';
@@ -70,14 +55,11 @@ $string['none'] = 'None';
 $string['numberofcolumns'] = 'Number of columns';
 $string['numberofrows'] = 'Number of rows';
 $string['outer'] = 'Around table';
-$string['outset'] = 'Outset';
 $string['pluginname'] = 'Table';
-$string['ridge'] = 'Ridge';
 $string['rows'] = 'Rows';
 $string['settings'] = 'Table settings';
 $string['solid'] = 'Solid';
 $string['themedefault'] = 'Theme default';
 $string['transparent'] = 'Transparent';
-$string['unset'] = 'Unset';
 $string['updatetable'] = 'Update table';
 $string['width'] = 'Table width (in %)';
diff --git a/lib/editor/atto/plugins/table/lib.php b/lib/editor/atto/plugins/table/lib.php
index d729a2c4d20..4d177aee70d 100644
--- a/lib/editor/atto/plugins/table/lib.php
+++ b/lib/editor/atto/plugins/table/lib.php
@@ -60,19 +60,10 @@ function atto_table_strings_for_js() {
                                           'width',
                                           'outer',
                                           'noborder',
-                                          'inherit',
                                           'themedefault',
-                                          'initial',
-                                          'unset',
-                                          'hidden',
                                           'dotted',
                                           'dashed',
-                                          'solid',
-                                          'double',
-                                          'groove',
-                                          'ridge',
-                                          'inset',
-                                          'outset'),
+                                          'solid'),
                                     'atto_table');
 
     $PAGE->requires->strings_for_js(array('top',
@@ -88,12 +79,7 @@ function atto_table_strings_for_js() {
  */
 function atto_table_params_for_js($elementid, $options, $foptions) {
     $params = array('allowBorders' => (bool) get_config('atto_table', 'allowborders'),
-                    'allowBorderStyles' => (bool) get_config('atto_table', 'allowborderstyles'),
-                    'borderStyles' => get_config('atto_table', 'borderstyles'),
-                    'allowBorderSize' => (bool) get_config('atto_table', 'allowbordersize'),
-                    'allowBorderColour' => (bool) get_config('atto_table', 'allowbordercolour'),
                     'allowWidth' => (bool) get_config('atto_table', 'allowwidth'),
-                    'availableColors' => get_config('atto_table', 'availablecolors'),
                     'allowBackgroundColour' => (bool) get_config('atto_table', 'allowbackgroundcolour'));
     return $params;
 }
diff --git a/lib/editor/atto/plugins/table/settings.php b/lib/editor/atto/plugins/table/settings.php
index 3e7c181537d..df0448d3931 100644
--- a/lib/editor/atto/plugins/table/settings.php
+++ b/lib/editor/atto/plugins/table/settings.php
@@ -38,77 +38,21 @@ if ($ADMIN->fulltree) {
                                                 $default);
     $settings->add($setting);
 
-    $name = new lang_string('allowborderstyle', 'atto_table');
-    $desc = new lang_string('allowborderstyle_desc', 'atto_table');
-    $default = 0;
-
-    $setting = new admin_setting_configcheckbox('atto_table/allowborderstyles',
-                                                $name,
-                                                $desc,
-                                                $default);
-    $settings->add($setting);
-
-    $name = new lang_string('borderstyles', 'atto_table');
-    $desc = new lang_string('borderstyles_desc', 'atto_table');
-    $default = array(
-            'initial' => new lang_string('initial', 'atto_table'),
-            'unset' => new lang_string('unset', 'atto_table'),
-            'none' => new lang_string('none', 'atto_table'),
-            'hidden' => new lang_string('hidden', 'atto_table'),
-            'dotted' => new lang_string('dotted', 'atto_table'),
-            'dashed' => new lang_string('dashed', 'atto_table'),
-            'solid' => new lang_string('solid', 'atto_table'),
-            'double' => new lang_string('double', 'atto_table'),
-            'groove' => new lang_string('groove', 'atto_table'),
-            'ridge' => new lang_string('ridge', 'atto_table'),
-            'inset' => new lang_string('inset', 'atto_table'),
-            'outset' => new lang_string('outset', 'atto_table'),
-        );
-
-    $setting = new admin_setting_configmultiselect('atto_table/borderstyles',
-                                                $name,
-                                                $desc,
-                                                array_keys($default),
-                                                $default);
-    $settings->add($setting);
-
-    $name = new lang_string('allowbordersize', 'atto_table');
-    $desc = new lang_string('allowbordersize_desc', 'atto_table');
-    $default = 0;
-
-    $setting = new admin_setting_configcheckbox('atto_table/allowbordersize',
-                                                $name,
-                                                $desc,
-                                                $default);
-    $settings->add($setting);
-
-    $name = new lang_string('allowbordercolour', 'atto_table');
-    $desc = new lang_string('allowbordercolour_desc', 'atto_table');
-    $default = 0;
-
-    $setting = new admin_setting_configcheckbox('atto_table/allowbordercolour',
-                                                $name,
-                                                $desc,
-                                                $default);
-    $settings->add($setting);
-
     $name = new lang_string('allowbackgroundcolour', 'atto_table');
-    $desc = new lang_string('allowbackgroundcolour_desc', 'atto_table');
     $default = 0;
 
     $setting = new admin_setting_configcheckbox('atto_table/allowbackgroundcolour',
                                                 $name,
-                                                $desc,
+                                                '',
                                                 $default);
     $settings->add($setting);
 
     $name = new lang_string('allowwidth', 'atto_table');
-    $desc = new lang_string('allowwidth_desc', 'atto_table');
     $default = 0;
 
     $setting = new admin_setting_configcheckbox('atto_table/allowwidth',
                                                 $name,
-                                                $desc,
+                                                '',
                                                 $default);
     $settings->add($setting);
 }
diff --git a/lib/editor/atto/plugins/table/tests/behat/table.feature b/lib/editor/atto/plugins/table/tests/behat/table.feature
index 05be36378ba..1083781ea59 100644
--- a/lib/editor/atto/plugins/table/tests/behat/table.feature
+++ b/lib/editor/atto/plugins/table/tests/behat/table.feature
@@ -40,9 +40,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 1 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -66,9 +63,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 1 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -105,9 +99,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 0 | atto_table |
-    | allowborderstyles | 0 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -140,9 +131,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 0 | atto_table |
-    | allowborderstyles | 0 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -155,12 +143,6 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     And I click on "Table" "button"
     When I click on "Edit table" "link"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I press "Update table"
@@ -176,9 +158,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 0 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -191,9 +170,9 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     When I click on "Table" "button"
     Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
+    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
+    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should exist
+    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should exist
     Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
     Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
@@ -212,9 +191,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 0 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -227,12 +203,6 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     And I click on "Table" "button"
     When I click on "Edit table" "link"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around each cell"
@@ -249,9 +219,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -263,12 +230,6 @@ Feature: Atto tables
     And I select the text in the "Blog entry body" Atto editor
     And I click on "Show more buttons" "button"
     When I click on "Table" "button"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
@@ -287,9 +248,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 0 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -302,12 +260,6 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     And I click on "Table" "button"
     When I click on "Edit table" "link"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
@@ -326,9 +278,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -340,12 +289,6 @@ Feature: Atto tables
     And I select the text in the "Blog entry body" Atto editor
     And I click on "Show more buttons" "button"
     When I click on "Table" "button"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
@@ -366,9 +309,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 0 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -381,12 +321,6 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     And I click on "Table" "button"
     When I click on "Edit table" "link"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should not exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
@@ -407,9 +341,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 1 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -421,12 +352,6 @@ Feature: Atto tables
     And I select the text in the "Blog entry body" Atto editor
     And I click on "Show more buttons" "button"
     When I click on "Table" "button"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "#FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
@@ -449,9 +374,6 @@ Feature: Atto tables
     Given the following config values are set as admin:
     | config | value | plugin |
     | allowborders | 1 | atto_table |
-    | allowborderstyles | 1 | atto_table |
-    | allowbordersize | 1 | atto_table |
-    | allowbordercolour | 1 | atto_table |
     | allowbackgroundcolour | 1 | atto_table |
     | allowwidth | 1 | atto_table |
     And I log in as "admin"
@@ -464,12 +386,6 @@ Feature: Atto tables
     And I click on "Show more buttons" "button"
     And I click on "Table" "button"
     When I click on "Edit table" "link"
-    Then ".moodle-dialogue-base .atto_form .borders" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .borderstyle" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordersize" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .bordercolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element" should exist
-    Then ".moodle-dialogue-base .atto_form .customwidth" "css_element" should exist
     And I click on "FFFFFF" "radio" in the ".moodle-dialogue-base .atto_form .backgroundcolour" "css_element"
     And I set the field "Table width (in %)" to "100"
     And I set the field "Borders" to "Around table"
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
index e56ea6650df..7bc7a43a219 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
@@ -35,7 +35,7 @@ YUI.add('moodle-atto_table-button', function (Y, NAME) {
 
 var COMPONENT = 'atto_table',
     DEFAULT = {
-        BORDERSTYLE: 'inherit',
+        BORDERSTYLE: 'none',
         BORDERWIDTH: '1'
     },
     DIALOGUE = {
@@ -84,52 +84,45 @@ var COMPONENT = 'atto_table',
                         '<option value="all">{{get_string "all" component}}' + '</option>' +
                     '</select>' +
                     '<br>' +
-                    '{{#if allowBorderStyles}}' +
-                        '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
-                        '{{get_string "borderstyles" component}}</label>' +
-                        '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
-                            '<option value="inherit">{{get_string "inherit" component}}</option>' +
-                            '{{#each borderStyles}}' +
-                                '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
-                            '{{/each}}' +
-                        '</select>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderSize}}' +
-                        '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
-                        '{{get_string "bordersize" component}}</label>' +
-                        '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
-                        'type="number" value="1" size="8" min="1" max="50"/>' +
-                        '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderColour}}' +
-                        '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
-                        '{{get_string "bordercolour" component}}</label>' +
-                        '<div id="{{elementid}}_atto_table_bordercolour"' +
-                        'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
-                            '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
-                            'style="background-color:transparent;color:transparent">' +
+                    '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
+                    '{{get_string "borderstyles" component}}</label>' +
+                    '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
+                        '{{#each borderStyles}}' +
+                            '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
+                        '{{/each}}' +
+                    '</select>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
+                    '{{get_string "bordersize" component}}</label>' +
+                    '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
+                    'type="number" value="1" size="8" min="1" max="50"/>' +
+                    '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
+                    '{{get_string "bordercolour" component}}</label>' +
+                    '<div id="{{elementid}}_atto_table_bordercolour"' +
+                    'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
+                        '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
+                        'style="background-color:transparent;color:transparent">' +
 
-                                '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
-                                'type="radio" name="borderColour" value="none" checked="checked"'+
-                                'title="{{get_string "themedefault" component}}"></input>' +
+                            '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
+                            'type="radio" name="borderColour" value="none" checked="checked"'+
+                            'title="{{get_string "themedefault" component}}"></input>' +
 
-                                '{{get_string "themedefault" component}}' +
+                            '{{get_string "themedefault" component}}' +
+                        '</label>' +
+                        '{{#each availableColours}}' +
+                            '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                            'style="background-color:{{this}};color:{{this}}">' +
+
+                                '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                                'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
+
+                                '{{this}}' +
                             '</label>' +
-                            '{{#each availableColours}}' +
-                                '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                'style="background-color:{{this}};color:{{this}}">' +
-
-                                    '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                    'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
-
-                                    '{{this}}' +
-                                '</label>' +
-                            '{{/each}}' +
-                        '</div>' +
-                        '<br>' +
-                    '{{/if}}' +
+                        '{{/each}}' +
+                    '</div>' +
+                    '<br>' +
                 '{{/if}}' +
                 '{{#if allowBackgroundColour}}' +
                     '<label for="{{elementid}}_atto_table_backgroundcolour" class="sameline">' +
@@ -162,7 +155,8 @@ var COMPONENT = 'atto_table',
                 '{{#if allowWidth}}' +
                     '<label for="{{elementid}}_atto_table_width" class="sameline">' +
                     '{{get_string "width" component}}</label>' +
-                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
+                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" ' +
+                        'type="number" min="0" max="100"/>' +
                     '<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
                     '<br>' +
                 '{{/if}}' +
@@ -346,10 +340,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
                 nonedit: !edit,
                 allowStyling: this.get('allowStyling'),
                 allowBorders: allowBorders,
-                allowBorderStyles: this.get('allowBorderStyles'),
                 borderStyles: this.get('borderStyles'),
-                allowBorderSize: this.get('allowBorderSize'),
-                allowBorderColour: this.get('allowBorderColour'),
                 allowBackgroundColour: this.get('allowBackgroundColour'),
                 availableColours: this.get('availableColors'),
                 allowWidth: this.get('allowWidth')
@@ -386,6 +377,10 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             borderColour    = tableForm.all('[name="borderColour"]'),
             disabledValue   = 'removeAttribute';
 
+        if (!enableBorders) {
+            return;
+        }
+
         if (enableBorders.get('value') === 'default') {
             disabledValue = 'setAttribute';
         }
@@ -1402,16 +1397,6 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             value: true
         },
 
-        /**
-         * Whether or not to allow style of borders
-         *
-         * @attribute allowBorderStyle
-         * @type Boolean
-         */
-        allowBorderStyles: {
-            value: true
-        },
-
         /**
          * What border styles to allow
          *
@@ -1420,38 +1405,11 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
          */
         borderStyles: {
             value: [
+                'none',
                 'solid',
                 'dashed',
                 'dotted'
-            ],
-            setter: function(value) {
-                if (value) {
-                    return value.replace(/ /g,'').split(',');
-                } else {
-                    // Not a valid value - revert to default value.
-                    return Y.Attribute.INVALID_VALUE;
-                }
-            }
-        },
-
-        /**
-         * Whether or not to allow border size
-         *
-         * @attribute allowBorderSize
-         * @type Boolean
-         */
-        allowBorderSize: {
-            value: true
-        },
-
-        /**
-         * Whether or not to allow colourizing borders
-         *
-         * @attribute allowBorderColours
-         * @type Boolean
-         */
-        allowBorderColour: {
-            value: true
+            ]
         },
 
         /**
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
index 7992b5d9939..015f2f141a3 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
@@ -1,4 +1,4 @@
-YUI.add("moodle-atto_table-button",function(e,t){var n="atto_table",r={BORDERSTYLE:"inherit",BORDERWIDTH:"1"},i={WIDTH:"480px"},s='<form class="{{CSS.FORM}}"><label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label><input class="{{CSS.CAPTION}} fullwidth" id="{{elementid}}_atto_table_caption" required /><br/><br/><label for="{{elementid}}_atto_table_captionposition" class="sameline">{{get_string "captionposition" component}}</label><select class="{{CSS.CAPTIONPOSITION}}" id="{{elementid}}_atto_table_captionposition"><option value=""></option><option value="top">{{get_string "top" "editor"}}</option><option value="bottom">{{get_string "bottom" "editor"}}</option></select><br/><label for="{{elementid}}_atto_table_headers" class="sameline">{{get_string "headers" component}}</label><select class="{{CSS.HEADERS}}" id="{{elementid}}_atto_table_headers"><option value="columns">{{get_string "columns" component}}</option><option value="rows">{{get_string "rows" component}}</option><option value="both">{{get_string "both" component}}</option></select><br/>{{#if nonedit}}<label for="{{elementid}}_atto_table_rows" class="sameline">{{get_string "numberofrows" component}}</label><input class="{{CSS.ROWS}}" type="number" value="3" id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/><br/><label for="{{elementid}}_atto_table_columns" class="sameline">{{get_string "numberofcolumns" component}}</label><input class="{{CSS.COLUMNS}}" type="number" value="3" id="{{elementid}}_atto_table_columns"size="8" min="1" max="20"/><br/>{{/if}}{{#if allowStyling}}<fieldset><legend class="mdl-align">{{get_string "appearance" component}}</legend>{{#if allowBorders}}<label for="{{elementid}}_atto_table_borders" class="sameline">{{get_string "borders" component}}</label><select name="borders" class="{{CSS.BORDERS}}" id="{{elementid}}_atto_table_borders"><option value="default">{{get_string "themedefault" component}}</option><option value="outer">{{get_string "outer" component}}</option><option value="all">{{get_string "all" component}}</option></select><br>{{#if allowBorderStyles}}<label for="{{elementid}}_atto_table_borderstyle" class="sameline">{{get_string "borderstyles" component}}</label><select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle"><option value="inherit">{{get_string "inherit" component}}</option>{{#each borderStyles}}<option value="{{this}}">{{get_string this ../component}}</option>{{/each}}</select><br>{{/if}}{{#if allowBorderSize}}<label for="{{elementid}}_atto_table_bordersize" class="sameline">{{get_string "bordersize" component}}</label><input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"type="number" value="1" size="8" min="1" max="50"/><label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label><br>{{/if}}{{#if allowBorderColour}}<label for="{{elementid}}_atto_table_bordercolour" class="sameline">{{get_string "bordercolour" component}}</label><div id="{{elementid}}_atto_table_bordercolour"class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1"><label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"style="background-color:transparent;color:transparent"><input id="{{../elementid}}_atto_table_bordercolour_-1"type="radio" name="borderColour" value="none" checked="checked"title="{{get_string "themedefault" component}}"></input>{{get_string "themedefault" component}}</label>{{#each availableColours}}<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"style="background-color:{{this}};color:{{this}}"><input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"type="radio" name="borderColour" value="{{this}}" title="{{this}}">{{this}}</label>{{/each}}</div><br>{{/if}}{{/if}}{{#if allowBackgroundColour}}<label for="{{elementid}}_atto_table_backgroundcolour" class="sameline">{{get_string "backgroundcolour" component}}</label><div id="{{elementid}}_atto_table_backgroundcolour"class="{{CSS.BACKGROUNDCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1"><label class="hideborder" for="{{../elementid}}_atto_table_backgroundcolour_-1"style="background-color:transparent;color:transparent"><input id="{{../elementid}}_atto_table_backgroundcolour_-1"type="radio" name="backgroundColour" value="none" checked="checked"title="{{get_string "themedefault" component}}"></input>{{get_string "themedefault" component}}</label>{{#each availableColours}}<label for="{{../elementid}}_atto_table_backgroundcolour_{{@index}}"style="background-color:{{this}};color:{{this}}"><input id="{{../elementid}}_atto_table_backgroundcolour_{{@index}}"type="radio" name="backgroundColour" value="{{this}}" title="{{this}}">{{this}}</label>{{/each}}</div><br>{{/if}}{{#if allowWidth}}<label for="{{elementid}}_atto_table_width" class="sameline">{{get_string "width" component}}</label><input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/><label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label><br>{{/if}}</fieldset>{{/if}}<div class="mdl-align"><br/>{{#if edit}}<button class="submit" type="submit">{{get_string "updatetable" component}}</button>{{/if}}{{#if nonedit}}<button class="submit" type="submit">{{get_string "createtable" component}}</button>{{/if}}</div></form>',o={CAPTION:"caption",CAPTIONPOSITION:"captionposition",HEADERS:"headers",ROWS:"rows",COLUMNS:"columns",SUBMIT:"submit",FORM:"atto_form",BORDERS:"borders",BORDERSIZE:"bordersize",BORDERSIZEUNIT:"px",BORDERCOLOUR:"bordercolour",BORDERSTYLE:"borderstyle",BACKGROUNDCOLOUR:"backgroundcolour",WIDTH:"customwidth",WIDTHUNIT:"%",AVAILABLECOLORS:"availablecolors",COLOURROW:"colourrow"},u={CAPTION:"."+o.CAPTION,CAPTIONPOSITION:"."+o.CAPTIONPOSITION,HEADERS:"."+o.HEADERS,ROWS:"."+o.ROWS,COLUMNS:"."+o.COLUMNS,SUBMIT:"."+o.SUBMIT,BORDERS:"."+o.BORDERS,BORDERSIZE:"."+o.BORDERSIZE,BORDERCOLOURS:"."+o.BORDERCOLOUR+' input[name="borderColour"]',SELECTEDBORDERCOLOUR:"."+o.BORDERCOLOUR+' input[name="borderColour"]:checked'
-,BORDERSTYLE:"."+o.BORDERSTYLE,BACKGROUNDCOLOURS:"."+o.BACKGROUNDCOLOUR+' input[name="backgroundColour"]',SELECTEDBACKGROUNDCOLOUR:"."+o.BACKGROUNDCOLOUR+' input[name="backgroundColour"]:checked',FORM:".atto_form",WIDTH:"."+o.WIDTH,AVAILABLECOLORS:"."+o.AVAILABLECOLORS};e.namespace("M.atto_table").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_contextMenu:null,_lastTarget:null,_menuOptions:null,initializer:function(){this.addButton({icon:"e/table",callback:this._displayTableEditor,tags:"table"}),e.UA.gecko&&(document.execCommand("enableInlineTableEditing",!1,!1),document.execCommand("enableObjectResizing",!1,!1))},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection!==!1&&!this._currentSelection.collapsed){var e=this.getDialogue({headerContent:M.util.get_string("createtable",n),focusAfterHide:!0,focusOnShowSelector:u.CAPTION,width:i.WIDTH});e.set("bodyContent",this._getDialogueContent(!1)).show(),this._updateAvailableSettings()}},_displayTableEditor:function(e){var t=this._getSuitableTableCell();return t?(e.tableCell=t,this._showTableMenu(e)):this._displayDialogue(e)},_stopAtContentEditableFilter:function(e){this.editor.contains(e)},_getDialogueContent:function(t){var r=e.Handlebars.compile(s),i=this.get("allowBorders");return this._content=e.Node.create(r({CSS:o,elementid:this.get("host").get("elementid"),component:n,edit:t,nonedit:!t,allowStyling:this.get("allowStyling"),allowBorders:i,allowBorderStyles:this.get("allowBorderStyles"),borderStyles:this.get("borderStyles"),allowBorderSize:this.get("allowBorderSize"),allowBorderColour:this.get("allowBorderColour"),allowBackgroundColour:this.get("allowBackgroundColour"),availableColours:this.get("availableColors"),allowWidth:this.get("allowWidth")})),t?this._content.one(".submit").on("click",this._updateTable,this):this._content.one(".submit").on("click",this._setTable,this),i&&this._content.one('[name="borders"]').on("change",this._updateAvailableSettings,this),this._content},_updateAvailableSettings:function(){var e=this._content,t=e.one('[name="borders"]'),n=e.one('[name="borderstyles"]'),r=e.one('[name="bordersize"]'),i=e.all('[name="borderColour"]'),s="removeAttribute";t.get("value")==="default"&&(s="setAttribute"),n&&n[s]("disabled"),r&&r[s]("disabled"),i&&i[s]("disabled")},_getSuitableTableCell:function(){var e=null,t=this.get("host");t.getSelectedNodes().some(function(t){if(t.ancestor("td, th, caption",!0,this._stopAtContentEditableFilter)){e=t;var n=t.ancestor("caption",!0,this._stopAtContentEditableFilter);if(n){var r=n.get("parentNode");r&&(e=r.one("td, th"))}return!0}});if(e){var n=t.getSelectionFromNode(e);t.setSelection(n)}return e},_changeNodeType:function(t,n){var r=e.Node.create("<"+n+"></"+n+">");return r.setAttrs(t.getAttrs()),t.get("childNodes").each(function(e){r.append(e.remove())}),t.replace(r),r},_updateTable:function(t){var n,r,i,s,o,a,f,l,c,h,p;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(u.FORM).one(u.CAPTION),r=t.currentTarget.ancestor(u.FORM).one(u.CAPTIONPOSITION),i=t.currentTarget.ancestor(u.FORM).one(u.HEADERS),s=t.currentTarget.ancestor(u.FORM).one(u.BORDERS),o=t.currentTarget.ancestor(u.FORM).one(u.BORDERSIZE),f=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBORDERCOLOUR),a=t.currentTarget.ancestor(u.FORM).one(u.BORDERSTYLE),l=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBACKGROUNDCOLOUR),h=t.currentTarget.ancestor(u.FORM).one(u.WIDTH),c=this._lastTarget.ancestor("table"),this._setAppearance(c,{width:h,borders:s,borderColour:f,borderSize:o,borderStyle:a,backgroundColour:l}),p=c.one("caption"),p||(p=e.Node.create("<caption></caption>"),c.insert(p,0)),p.setHTML(n.get("value")),p.setStyle("caption-side",r.get("value")),p.getAttribute("style")||p.removeAttribute("style"),(i.get("value")==="rows"||i.get("value")==="both")&&c.all("tr").each(function(e){var t=e.all("th, td"),n=t.shift(),r;n.get("tagName")==="TD"?(r=this._changeNodeType(n,"th"),r.setAttribute("scope","row")):n.setAttribute("scope","row"),t.each(function(e){e.get("tagName")==="TH"&&(r=this._changeNodeType(e,"td"),r.removeAttribute("scope"))},this)},this);if(i.get("value")==="columns"||i.get("value")==="both"){var d=c.all("tr"),v=d.shift(),m;v.all("td, th").each(function(e){e.get("tagName")==="TD"?(m=this._changeNodeType(e,"th"),m.setAttribute("scope","col")):e.setAttribute("scope","col")},this),d.each(function(e){var t=e.all("th, td");i.get("value")==="both"&&t.shift(),t.each(function(e){e.get("tagName")==="TH"&&(m=this._changeNodeType(e,"td"),m.removeAttribute("scope"))},this)},this)}this.markUpdated()},_setTable:function(t){var n,r,i,s,o,a,f,l,c,h,p,d,v,m;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(u.FORM).one(u.CAPTION),r=t.currentTarget.ancestor(u.FORM).one(u.CAPTIONPOSITION),i=t.currentTarget.ancestor(u.FORM).one(u.BORDERS),s=t.currentTarget.ancestor(u.FORM).one(u.BORDERSIZE),a=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBORDERCOLOUR),o=t.currentTarget.ancestor(u.FORM).one(u.BORDERSTYLE),p=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBACKGROUNDCOLOUR),f=t.currentTarget.ancestor(u.FORM).one(u.ROWS),l=t.currentTarget.ancestor(u.FORM).one(u.COLUMNS),c=t.currentTarget.ancestor(u.FORM).one(u.HEADERS),d=t.currentTarget.ancestor(u.FORM).one(u.WIDTH),this.get("host").setSelection(this._currentSelection);var g="\n",y=e.guid();h="<br/>"+g+'<table id="'+y+'">'+g;var b="";r.get("value")&&(b=' style="caption-side: '+r.get("value")+'"'),h+="<caption"+b+">"+e.Escape.html(n.get("value"))+"</caption>"+g,v=0;if(c.get("value")==="columns"||c.get("value")==="both"){v=1,h+="<thead>"+g+"<tr>"+g;for(m=0;m<parseInt(l.get("value"),10);m++)h+='<th scope="col"></th>'+g;h+="</tr>"+g+"</thead>"+g}h+="<tbody>"+g;for(;v<parseInt(f.get("value"),10);v++){h+="<tr>"+g;for(m=0;m<parseInt(l.get("value"),10);m++)m!==0||c.get("value")!=="rows"&&c.get("value")!=="both"?h+="<td ></td>"+g:h+='<th scope="row"></th>'+
-g;h+="</tr>"+g}h+="</tbody>"+g,h+="</table>"+g+"<br/>",this.get("host").insertContentAtFocusPoint(h);var w=e.one("#"+y);this._setAppearance(w,{width:d,borders:i,borderColour:a,borderSize:s,borderStyle:o,backgroundColour:p}),w.removeAttribute("id"),this.markUpdated()},_findColumnCells:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=new e.NodeList,s=new e.NodeList;return n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t-1),a=n.item(t+1);r.push(o),u&&i.push(u),a&&s.push(a)}),{current:r,prev:i,next:s}},_hideInvalidEntries:function(e){var t=this._lastTarget.ancestor("table"),n=this._lastTarget.ancestor("tr"),r=t.all("tr"),i=r.indexOf(n),s=r.item(i-1),o=s?s.one("td"):null;!n||!o?e.one('[data-change="moverowup"]').hide():e.one('[data-change="moverowup"]').show();var u=r.item(i+1),a=n?n.one("td"):!1;!n||!u||!a?e.one('[data-change="moverowdown"]').hide():e.one('[data-change="moverowdown"]').show();var f=this._findColumnCells();f.prev.filter("td").size()>0?e.one('[data-change="movecolumnleft"]').show():e.one('[data-change="movecolumnleft"]').hide();var l=f.current.filter("td").size()>0;f.next.size()>0&&l?e.one('[data-change="movecolumnright"]').show():e.one('[data-change="movecolumnright"]').hide(),f.current.filter("td").size()>0?e.one('[data-change="deletecolumn"]').show():e.one('[data-change="deletecolumn"]').hide(),!n||!n.one("td")?e.one('[data-change="deleterow"]').hide():e.one('[data-change="deleterow"]').show()},_showTableMenu:function(t){t.preventDefault();var r;this._contextMenu||(this._menuOptions=[{text:M.util.get_string("addcolumnafter",n),data:{change:"addcolumnafter"}},{text:M.util.get_string("addrowafter",n),data:{change:"addrowafter"}},{text:M.util.get_string("moverowup",n),data:{change:"moverowup"}},{text:M.util.get_string("moverowdown",n),data:{change:"moverowdown"}},{text:M.util.get_string("movecolumnleft",n),data:{change:"movecolumnleft"}},{text:M.util.get_string("movecolumnright",n),data:{change:"movecolumnright"}},{text:M.util.get_string("deleterow",n),data:{change:"deleterow"}},{text:M.util.get_string("deletecolumn",n),data:{change:"deletecolumn"}},{text:M.util.get_string("edittable",n),data:{change:"edittable"}}],this._contextMenu=new e.M.editor_atto.Menu({items:this._menuOptions}),r=this._contextMenu.get("boundingBox"),r.delegate("click",this._handleTableChange,"a",this)),r=this._contextMenu.get("boundingBox"),this._lastTarget=t.tableCell.ancestor(".editor_atto_content td, .editor_atto_content th",!0),this._hideInvalidEntries(r),e.Array.each(this.get("host").openMenus,function(e){e.set("focusAfterHide",null)});var i=this.buttons[this.name];this.get("host")._setTabFocus(i),this._contextMenu.show(),this._contextMenu.align(this.buttons.table,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),this._contextMenu.set("focusAfterHide",i),r.one("a")&&r.one("a").focus(),this.get("host").openMenus=[this._contextMenu]},_handleTableChange:function(e){e.preventDefault(),this._contextMenu.set("focusAfterHide",this.get("host").editor),this._contextMenu.hide(e);switch(e.target.getData("change")){case"addcolumnafter":this._addColumnAfter();break;case"addrowafter":this._addRowAfter();break;case"deleterow":this._deleteRow();break;case"deletecolumn":this._deleteColumn();break;case"edittable":this._editTable();break;case"moverowdown":this._moveRowDown();break;case"moverowup":this._moveRowUp();break;case"movecolumnleft":this._moveColumnLeft();break;case"movecolumnright":this._moveColumnRight()}},_getRowIndex:function(e){var t=e.ancestor("table"),n=e.ancestor("tr");if(!t||!n)return;var r=t.all("tr");return r.indexOf(n)},_getColumnIndex:function(e){var t=e.ancestor("tr");if(!t)return;var n=t.all("td, th");return n.indexOf(e)},_deleteRow:function(){var e=this._lastTarget.ancestor("tr");e&&e.one("td")&&e.remove(!0),this.markUpdated()},_moveRowUp:function(){var e=this._lastTarget.ancestor("tr"),t=e.previous("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_moveColumnLeft:function(){var e=this._findColumnCells();if(e.current.size()>0&&e.prev.size()>0&&e.current.size()===e.prev.size()){var t=0;for(t=0;t<e.current.size();t++){var n=e.current.item(t),r=e.prev.item(t);n.swap(r)}}this.markUpdated()},_addCaption:function(){var t=this._lastTarget.ancestor("table"),n=t.one("caption");n||t.insert(e.Node.create("<caption>&nbsp;</caption>"),1)},_removeCaption:function(){var e=this._lastTarget.ancestor("table"),t=e.one("caption");t&&t.remove(!0)},_moveColumnRight:function(){var e=this._findColumnCells();if(e.next.size()>0&&e.current.size()===e.next.size()&&e.current.filter("td").size()>0){var t=0;for(t=0;t<e.current.size();t++){var n=e.current.item(t),r=e.next.item(t);n.swap(r)}}this.markUpdated()},_moveRowDown:function(){var e=this._lastTarget.ancestor("tr"),t=e.next("tr");if(!e||!t||!e.one("td"))return;e.swap(t),this.markUpdated()},_getBorderConfiguration:function(t){var n=t.cloneNode(!0),r=n.getStyle("borderStyle"),i=n.getStyle("borderColor"),s=n.getStyle("borderWidth");if(r||i||s){var o=e.Color.toHex(i),u=parseInt(s,10);return{borderStyle:r,borderColor:o==="#"?null:o,borderWidth:isNaN(u)?null:u}}return!1},_setAppearance:function(e,t){var n,r,i,s;t.borderColour&&(n=t.borderColour.get("value")),t.borderSize&&(r=t.borderSize.get("value")),t.borderStyle&&(i=t.borderStyle.get("value")),t.backgroundColour&&(s=t.backgroundColour.get("value")),e.removeAttribute("style"),e.all("td, th").each(function(e){e.removeAttribute("style")},this),t.borders&&(t.borders.get("value")==="outer"?(e.setStyle("borderWidth",r+o.BORDERSIZEUNIT),e.setStyle("borderStyle",i),n!=="none"&&e.setStyle("borderColor",n)):t.borders.get("value")==="all"&&e.all("td, th").each(function(e){e.setStyle("borderWidth",r+o.BORDERSIZEUNIT),e.setStyle("borderStyle",i),n!=="none"&&e.setStyle("borderColor",n)},this)),s!=="none"&&e.setStyle("backgroundColor",s),t.width&&t.width.get("value")&&e.setStyle("width",t.width.get("value")+o.WIDTHUNIT)},_editTable:function(){var t=
-this.getDialogue({headerContent:M.util.get_string("edittable",n),focusAfterHide:!1,focusOnShowSelector:u.CAPTION,width:i.WIDTH}),s=this._getDialogueContent(!0),o=s.one(u.CAPTION),a=s.one(u.CAPTIONPOSITION),f=s.one(u.HEADERS),l=s.one(u.BORDERS),c=s.one(u.BORDERSTYLE),h=s.all(u.BORDERCOLOURS),p=s.one(u.BORDERSIZE),d=s.all(u.BACKGROUNDCOLOURS),v=s.one(u.WIDTH),m=this._lastTarget.ancestor("table"),g=m.one("caption"),y,b;g?o.set("value",g.getHTML()):o.set("value",""),v&&m.getStyle("width").indexOf("px")===-1&&v.set("value",parseInt(m.getStyle("width"),10)),a&&g&&g.getAttribute("style")?a.set("value",g.getStyle("caption-side")):a.set("value",""),m.getStyle("backgroundColor")&&this.get("allowBackgroundColour")&&(y=e.Color.toHex(m.getStyle("backgroundColor")),b=d.filter('[value="'+y+'"]'),b&&b.set("checked",!0));if(this.get("allowBorders")){var w="default",E=this._getBorderConfiguration(m);E?w="outer":(E=this._getBorderConfiguration(m.one("td")),E&&(w="all"));if(E){var S=E.borderStyle||r.BORDERSTYLE,x=E.borderWidth||r.BORDERWIDTH;c.set("value",S),p.set("value",x),l.set("value",w),y=E.borderColor,b=h.filter('[value="'+y+'"]'),b&&b.set("checked",!0)}}var T="columns";m.one('th[scope="row"]')&&(T="rows",m.one('th[scope="col"]')&&(T="both")),f.set("value",T),t.set("bodyContent",s).show(),this._updateAvailableSettings()},_deleteColumn:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table"),r=n.all("tr"),i=new e.NodeList,s=!1;r.each(function(e){var n=e.all("td, th"),r=n.item(t);r.get("tagName")==="TD"&&(s=!0),i.push(r)}),s&&i.remove(!0),this.markUpdated()},_addRowAfter:function(){var t=this._lastTarget.ancestor("tr"),n=this._lastTarget.ancestor("table").one("tbody");n||(n=this._lastTarget.ancestor("table"));var r=n.one("tr");r||(r=this._lastTarget.ancestor("table").one("tr"));if(!r)return;var i=r.cloneNode(!0);i.all("th, td").each(function(t){if(t.get("tagName")==="TH"&&t.getAttribute("scope")!=="row"){var n=e.Node.create("<td></td>");t.replace(n),t=n}t.setHTML("&nbsp;")}),t.ancestor("thead")?(t=r,n.insert(i,t)):t.insert(i,"after"),this.markUpdated()},_addColumnAfter:function(){var t=this._findColumnCells(),n=!0,r=t.next;t.next.size()<=0&&(n=!1,r=t.current),e.each(r,function(e){var t=e.cloneNode();t.setHTML("&nbsp;"),n?e.get("parentNode").insert(t,e):(e.get("parentNode").insert(t,e),e.swap(t))},this),this.markUpdated()}},{ATTRS:{allowBorders:{value:!0},allowBorderStyles:{value:!0},borderStyles:{value:["solid","dashed","dotted"],setter:function(t){return t?t.replace(/ /g,"").split(","):e.Attribute.INVALID_VALUE}},allowBorderSize:{value:!0},allowBorderColour:{value:!0},allowBackgroundColour:{value:!0},allowWidth:{value:!0},allowStyling:{readOnly:!0,getter:function(){return this.get("allowBorders")||this.get("allowBackgroundColour")||this.get("allowWidth")}},availableColors:{value:["#FFFFFF","#EF4540","#FFCF35","#98CA3E","#7D9FD3","#333333"],readOnly:!0}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-editor_atto-menu","event","event-valuechange"]});
+YUI.add("moodle-atto_table-button",function(e,t){var n="atto_table",r={BORDERSTYLE:"none",BORDERWIDTH:"1"},i={WIDTH:"480px"},s='<form class="{{CSS.FORM}}"><label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label><input class="{{CSS.CAPTION}} fullwidth" id="{{elementid}}_atto_table_caption" required /><br/><br/><label for="{{elementid}}_atto_table_captionposition" class="sameline">{{get_string "captionposition" component}}</label><select class="{{CSS.CAPTIONPOSITION}}" id="{{elementid}}_atto_table_captionposition"><option value=""></option><option value="top">{{get_string "top" "editor"}}</option><option value="bottom">{{get_string "bottom" "editor"}}</option></select><br/><label for="{{elementid}}_atto_table_headers" class="sameline">{{get_string "headers" component}}</label><select class="{{CSS.HEADERS}}" id="{{elementid}}_atto_table_headers"><option value="columns">{{get_string "columns" component}}</option><option value="rows">{{get_string "rows" component}}</option><option value="both">{{get_string "both" component}}</option></select><br/>{{#if nonedit}}<label for="{{elementid}}_atto_table_rows" class="sameline">{{get_string "numberofrows" component}}</label><input class="{{CSS.ROWS}}" type="number" value="3" id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/><br/><label for="{{elementid}}_atto_table_columns" class="sameline">{{get_string "numberofcolumns" component}}</label><input class="{{CSS.COLUMNS}}" type="number" value="3" id="{{elementid}}_atto_table_columns"size="8" min="1" max="20"/><br/>{{/if}}{{#if allowStyling}}<fieldset><legend class="mdl-align">{{get_string "appearance" component}}</legend>{{#if allowBorders}}<label for="{{elementid}}_atto_table_borders" class="sameline">{{get_string "borders" component}}</label><select name="borders" class="{{CSS.BORDERS}}" id="{{elementid}}_atto_table_borders"><option value="default">{{get_string "themedefault" component}}</option><option value="outer">{{get_string "outer" component}}</option><option value="all">{{get_string "all" component}}</option></select><br><label for="{{elementid}}_atto_table_borderstyle" class="sameline">{{get_string "borderstyles" component}}</label><select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">{{#each borderStyles}}<option value="{{this}}">{{get_string this ../component}}</option>{{/each}}</select><br><label for="{{elementid}}_atto_table_bordersize" class="sameline">{{get_string "bordersize" component}}</label><input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"type="number" value="1" size="8" min="1" max="50"/><label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label><br><label for="{{elementid}}_atto_table_bordercolour" class="sameline">{{get_string "bordercolour" component}}</label><div id="{{elementid}}_atto_table_bordercolour"class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1"><label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"style="background-color:transparent;color:transparent"><input id="{{../elementid}}_atto_table_bordercolour_-1"type="radio" name="borderColour" value="none" checked="checked"title="{{get_string "themedefault" component}}"></input>{{get_string "themedefault" component}}</label>{{#each availableColours}}<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"style="background-color:{{this}};color:{{this}}"><input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"type="radio" name="borderColour" value="{{this}}" title="{{this}}">{{this}}</label>{{/each}}</div><br>{{/if}}{{#if allowBackgroundColour}}<label for="{{elementid}}_atto_table_backgroundcolour" class="sameline">{{get_string "backgroundcolour" component}}</label><div id="{{elementid}}_atto_table_backgroundcolour"class="{{CSS.BACKGROUNDCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1"><label class="hideborder" for="{{../elementid}}_atto_table_backgroundcolour_-1"style="background-color:transparent;color:transparent"><input id="{{../elementid}}_atto_table_backgroundcolour_-1"type="radio" name="backgroundColour" value="none" checked="checked"title="{{get_string "themedefault" component}}"></input>{{get_string "themedefault" component}}</label>{{#each availableColours}}<label for="{{../elementid}}_atto_table_backgroundcolour_{{@index}}"style="background-color:{{this}};color:{{this}}"><input id="{{../elementid}}_atto_table_backgroundcolour_{{@index}}"type="radio" name="backgroundColour" value="{{this}}" title="{{this}}">{{this}}</label>{{/each}}</div><br>{{/if}}{{#if allowWidth}}<label for="{{elementid}}_atto_table_width" class="sameline">{{get_string "width" component}}</label><input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/><label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label><br>{{/if}}</fieldset>{{/if}}<div class="mdl-align"><br/>{{#if edit}}<button class="submit" type="submit">{{get_string "updatetable" component}}</button>{{/if}}{{#if nonedit}}<button class="submit" type="submit">{{get_string "createtable" component}}</button>{{/if}}</div></form>',o={CAPTION:"caption",CAPTIONPOSITION:"captionposition",HEADERS:"headers",ROWS:"rows",COLUMNS:"columns",SUBMIT:"submit",FORM:"atto_form",BORDERS:"borders",BORDERSIZE:"bordersize",BORDERSIZEUNIT:"px",BORDERCOLOUR:"bordercolour",BORDERSTYLE:"borderstyle",BACKGROUNDCOLOUR:"backgroundcolour",WIDTH:"customwidth",WIDTHUNIT:"%",AVAILABLECOLORS:"availablecolors",COLOURROW:"colourrow"},u={CAPTION:"."+o.CAPTION,CAPTIONPOSITION:"."+o.CAPTIONPOSITION,HEADERS:"."+o.HEADERS,ROWS:"."+o.ROWS,COLUMNS:"."+o.COLUMNS,SUBMIT:"."+o.SUBMIT,BORDERS:"."+o.BORDERS,BORDERSIZE:"."+o.BORDERSIZE,BORDERCOLOURS:"."+o.BORDERCOLOUR+' input[name="borderColour"]',SELECTEDBORDERCOLOUR:"."+o.BORDERCOLOUR+' input[name="borderColour"]:checked',BORDERSTYLE:"."+o.BORDERSTYLE,BACKGROUNDCOLOURS:"."+o.BACKGROUNDCOLOUR+' input[name="backgroundColour"]',SELECTEDBACKGROUNDCOLOUR
+:"."+o.BACKGROUNDCOLOUR+' input[name="backgroundColour"]:checked',FORM:".atto_form",WIDTH:"."+o.WIDTH,AVAILABLECOLORS:"."+o.AVAILABLECOLORS};e.namespace("M.atto_table").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,_contextMenu:null,_lastTarget:null,_menuOptions:null,initializer:function(){this.addButton({icon:"e/table",callback:this._displayTableEditor,tags:"table"}),e.UA.gecko&&(document.execCommand("enableInlineTableEditing",!1,!1),document.execCommand("enableObjectResizing",!1,!1))},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection!==!1&&!this._currentSelection.collapsed){var e=this.getDialogue({headerContent:M.util.get_string("createtable",n),focusAfterHide:!0,focusOnShowSelector:u.CAPTION,width:i.WIDTH});e.set("bodyContent",this._getDialogueContent(!1)).show(),this._updateAvailableSettings()}},_displayTableEditor:function(e){var t=this._getSuitableTableCell();return t?(e.tableCell=t,this._showTableMenu(e)):this._displayDialogue(e)},_stopAtContentEditableFilter:function(e){this.editor.contains(e)},_getDialogueContent:function(t){var r=e.Handlebars.compile(s),i=this.get("allowBorders");return this._content=e.Node.create(r({CSS:o,elementid:this.get("host").get("elementid"),component:n,edit:t,nonedit:!t,allowStyling:this.get("allowStyling"),allowBorders:i,borderStyles:this.get("borderStyles"),allowBackgroundColour:this.get("allowBackgroundColour"),availableColours:this.get("availableColors"),allowWidth:this.get("allowWidth")})),t?this._content.one(".submit").on("click",this._updateTable,this):this._content.one(".submit").on("click",this._setTable,this),i&&this._content.one('[name="borders"]').on("change",this._updateAvailableSettings,this),this._content},_updateAvailableSettings:function(){var e=this._content,t=e.one('[name="borders"]'),n=e.one('[name="borderstyles"]'),r=e.one('[name="bordersize"]'),i=e.all('[name="borderColour"]'),s="removeAttribute";if(!t)return;t.get("value")==="default"&&(s="setAttribute"),n&&n[s]("disabled"),r&&r[s]("disabled"),i&&i[s]("disabled")},_getSuitableTableCell:function(){var e=null,t=this.get("host");t.getSelectedNodes().some(function(t){if(t.ancestor("td, th, caption",!0,this._stopAtContentEditableFilter)){e=t;var n=t.ancestor("caption",!0,this._stopAtContentEditableFilter);if(n){var r=n.get("parentNode");r&&(e=r.one("td, th"))}return!0}});if(e){var n=t.getSelectionFromNode(e);t.setSelection(n)}return e},_changeNodeType:function(t,n){var r=e.Node.create("<"+n+"></"+n+">");return r.setAttrs(t.getAttrs()),t.get("childNodes").each(function(e){r.append(e.remove())}),t.replace(r),r},_updateTable:function(t){var n,r,i,s,o,a,f,l,c,h,p;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(u.FORM).one(u.CAPTION),r=t.currentTarget.ancestor(u.FORM).one(u.CAPTIONPOSITION),i=t.currentTarget.ancestor(u.FORM).one(u.HEADERS),s=t.currentTarget.ancestor(u.FORM).one(u.BORDERS),o=t.currentTarget.ancestor(u.FORM).one(u.BORDERSIZE),f=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBORDERCOLOUR),a=t.currentTarget.ancestor(u.FORM).one(u.BORDERSTYLE),l=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBACKGROUNDCOLOUR),h=t.currentTarget.ancestor(u.FORM).one(u.WIDTH),c=this._lastTarget.ancestor("table"),this._setAppearance(c,{width:h,borders:s,borderColour:f,borderSize:o,borderStyle:a,backgroundColour:l}),p=c.one("caption"),p||(p=e.Node.create("<caption></caption>"),c.insert(p,0)),p.setHTML(n.get("value")),p.setStyle("caption-side",r.get("value")),p.getAttribute("style")||p.removeAttribute("style"),(i.get("value")==="rows"||i.get("value")==="both")&&c.all("tr").each(function(e){var t=e.all("th, td"),n=t.shift(),r;n.get("tagName")==="TD"?(r=this._changeNodeType(n,"th"),r.setAttribute("scope","row")):n.setAttribute("scope","row"),t.each(function(e){e.get("tagName")==="TH"&&(r=this._changeNodeType(e,"td"),r.removeAttribute("scope"))},this)},this);if(i.get("value")==="columns"||i.get("value")==="both"){var d=c.all("tr"),v=d.shift(),m;v.all("td, th").each(function(e){e.get("tagName")==="TD"?(m=this._changeNodeType(e,"th"),m.setAttribute("scope","col")):e.setAttribute("scope","col")},this),d.each(function(e){var t=e.all("th, td");i.get("value")==="both"&&t.shift(),t.each(function(e){e.get("tagName")==="TH"&&(m=this._changeNodeType(e,"td"),m.removeAttribute("scope"))},this)},this)}this.markUpdated()},_setTable:function(t){var n,r,i,s,o,a,f,l,c,h,p,d,v,m;t.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),n=t.currentTarget.ancestor(u.FORM).one(u.CAPTION),r=t.currentTarget.ancestor(u.FORM).one(u.CAPTIONPOSITION),i=t.currentTarget.ancestor(u.FORM).one(u.BORDERS),s=t.currentTarget.ancestor(u.FORM).one(u.BORDERSIZE),a=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBORDERCOLOUR),o=t.currentTarget.ancestor(u.FORM).one(u.BORDERSTYLE),p=t.currentTarget.ancestor(u.FORM).one(u.SELECTEDBACKGROUNDCOLOUR),f=t.currentTarget.ancestor(u.FORM).one(u.ROWS),l=t.currentTarget.ancestor(u.FORM).one(u.COLUMNS),c=t.currentTarget.ancestor(u.FORM).one(u.HEADERS),d=t.currentTarget.ancestor(u.FORM).one(u.WIDTH),this.get("host").setSelection(this._currentSelection);var g="\n",y=e.guid();h="<br/>"+g+'<table id="'+y+'">'+g;var b="";r.get("value")&&(b=' style="caption-side: '+r.get("value")+'"'),h+="<caption"+b+">"+e.Escape.html(n.get("value"))+"</caption>"+g,v=0;if(c.get("value")==="columns"||c.get("value")==="both"){v=1,h+="<thead>"+g+"<tr>"+g;for(m=0;m<parseInt(l.get("value"),10);m++)h+='<th scope="col"></th>'+g;h+="</tr>"+g+"</thead>"+g}h+="<tbody>"+g;for(;v<parseInt(f.get("value"),10);v++){h+="<tr>"+g;for(m=0;m<parseInt(l.get("value"),10);m++)m!==0||c.get("value")!=="rows"&&c.get("value")!=="both"?h+="<td ></td>"+g:h+='<th scope="row"></th>'+g;h+="</tr>"+g}h+="</tbody>"+g,h+="</table>"+g+"<br/>",this.get("host").insertContentAtFocusPoint(h);var w=e.one("#"+y);this._setAppearance(w,{width:d,borders:i,borderColour:a,borderSize:s,borderStyle:o,backgroundColour:p}),w.removeAttribute
+("id"),this.markUpdated()},_findColumnCells:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table").all("tr"),r=new e.NodeList,i=new e.NodeList,s=new e.NodeList;return n.each(function(e){var n=e.all("td, th"),o=n.item(t),u=n.item(t-1),a=n.item(t+1);r.push(o),u&&i.push(u),a&&s.push(a)}),{current:r,prev:i,next:s}},_hideInvalidEntries:function(e){var t=this._lastTarget.ancestor("table"),n=this._lastTarget.ancestor("tr"),r=t.all("tr"),i=r.indexOf(n),s=r.item(i-1),o=s?s.one("td"):null;!n||!o?e.one('[data-change="moverowup"]').hide():e.one('[data-change="moverowup"]').show();var u=r.item(i+1),a=n?n.one("td"):!1;!n||!u||!a?e.one('[data-change="moverowdown"]').hide():e.one('[data-change="moverowdown"]').show();var f=this._findColumnCells();f.prev.filter("td").size()>0?e.one('[data-change="movecolumnleft"]').show():e.one('[data-change="movecolumnleft"]').hide();var l=f.current.filter("td").size()>0;f.next.size()>0&&l?e.one('[data-change="movecolumnright"]').show():e.one('[data-change="movecolumnright"]').hide(),f.current.filter("td").size()>0?e.one('[data-change="deletecolumn"]').show():e.one('[data-change="deletecolumn"]').hide(),!n||!n.one("td")?e.one('[data-change="deleterow"]').hide():e.one('[data-change="deleterow"]').show()},_showTableMenu:function(t){t.preventDefault();var r;this._contextMenu||(this._menuOptions=[{text:M.util.get_string("addcolumnafter",n),data:{change:"addcolumnafter"}},{text:M.util.get_string("addrowafter",n),data:{change:"addrowafter"}},{text:M.util.get_string("moverowup",n),data:{change:"moverowup"}},{text:M.util.get_string("moverowdown",n),data:{change:"moverowdown"}},{text:M.util.get_string("movecolumnleft",n),data:{change:"movecolumnleft"}},{text:M.util.get_string("movecolumnright",n),data:{change:"movecolumnright"}},{text:M.util.get_string("deleterow",n),data:{change:"deleterow"}},{text:M.util.get_string("deletecolumn",n),data:{change:"deletecolumn"}},{text:M.util.get_string("edittable",n),data:{change:"edittable"}}],this._contextMenu=new e.M.editor_atto.Menu({items:this._menuOptions}),r=this._contextMenu.get("boundingBox"),r.delegate("click",this._handleTableChange,"a",this)),r=this._contextMenu.get("boundingBox"),this._lastTarget=t.tableCell.ancestor(".editor_atto_content td, .editor_atto_content th",!0),this._hideInvalidEntries(r),e.Array.each(this.get("host").openMenus,function(e){e.set("focusAfterHide",null)});var i=this.buttons[this.name];this.get("host")._setTabFocus(i),this._contextMenu.show(),this._contextMenu.align(this.buttons.table,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),this._contextMenu.set("focusAfterHide",i),r.one("a")&&r.one("a").focus(),this.get("host").openMenus=[this._contextMenu]},_handleTableChange:function(e){e.preventDefault(),this._contextMenu.set("focusAfterHide",this.get("host").editor),this._contextMenu.hide(e);switch(e.target.getData("change")){case"addcolumnafter":this._addColumnAfter();break;case"addrowafter":this._addRowAfter();break;case"deleterow":this._deleteRow();break;case"deletecolumn":this._deleteColumn();break;case"edittable":this._editTable();break;case"moverowdown":this._moveRowDown();break;case"moverowup":this._moveRowUp();break;case"movecolumnleft":this._moveColumnLeft();break;case"movecolumnright":this._moveColumnRight()}},_getRowIndex:function(e){var t=e.ancestor("table"),n=e.ancestor("tr");if(!t||!n)return;var r=t.all("tr");return r.indexOf(n)},_getColumnIndex:function(e){var t=e.ancestor("tr");if(!t)return;var n=t.all("td, th");return n.indexOf(e)},_deleteRow:function(){var e=this._lastTarget.ancestor("tr");e&&e.one("td")&&e.remove(!0),this.markUpdated()},_moveRowUp:function(){var e=this._lastTarget.ancestor("tr"),t=e.previous("tr");if(!e||!t)return;e.swap(t),this.markUpdated()},_moveColumnLeft:function(){var e=this._findColumnCells();if(e.current.size()>0&&e.prev.size()>0&&e.current.size()===e.prev.size()){var t=0;for(t=0;t<e.current.size();t++){var n=e.current.item(t),r=e.prev.item(t);n.swap(r)}}this.markUpdated()},_addCaption:function(){var t=this._lastTarget.ancestor("table"),n=t.one("caption");n||t.insert(e.Node.create("<caption>&nbsp;</caption>"),1)},_removeCaption:function(){var e=this._lastTarget.ancestor("table"),t=e.one("caption");t&&t.remove(!0)},_moveColumnRight:function(){var e=this._findColumnCells();if(e.next.size()>0&&e.current.size()===e.next.size()&&e.current.filter("td").size()>0){var t=0;for(t=0;t<e.current.size();t++){var n=e.current.item(t),r=e.next.item(t);n.swap(r)}}this.markUpdated()},_moveRowDown:function(){var e=this._lastTarget.ancestor("tr"),t=e.next("tr");if(!e||!t||!e.one("td"))return;e.swap(t),this.markUpdated()},_getBorderConfiguration:function(t){var n=t.cloneNode(!0),r=n.getStyle("borderStyle"),i=n.getStyle("borderColor"),s=n.getStyle("borderWidth");if(r||i||s){var o=e.Color.toHex(i),u=parseInt(s,10);return{borderStyle:r,borderColor:o==="#"?null:o,borderWidth:isNaN(u)?null:u}}return!1},_setAppearance:function(e,t){var n,r,i,s;t.borderColour&&(n=t.borderColour.get("value")),t.borderSize&&(r=t.borderSize.get("value")),t.borderStyle&&(i=t.borderStyle.get("value")),t.backgroundColour&&(s=t.backgroundColour.get("value")),e.removeAttribute("style"),e.all("td, th").each(function(e){e.removeAttribute("style")},this),t.borders&&(t.borders.get("value")==="outer"?(e.setStyle("borderWidth",r+o.BORDERSIZEUNIT),e.setStyle("borderStyle",i),n!=="none"&&e.setStyle("borderColor",n)):t.borders.get("value")==="all"&&e.all("td, th").each(function(e){e.setStyle("borderWidth",r+o.BORDERSIZEUNIT),e.setStyle("borderStyle",i),n!=="none"&&e.setStyle("borderColor",n)},this)),s!=="none"&&e.setStyle("backgroundColor",s),t.width&&t.width.get("value")&&e.setStyle("width",t.width.get("value")+o.WIDTHUNIT)},_editTable:function(){var t=this.getDialogue({headerContent:M.util.get_string("edittable",n),focusAfterHide:!1,focusOnShowSelector:u.CAPTION,width:i.WIDTH}),s=this._getDialogueContent(!0),o=s.one(u.CAPTION),a=s.one(u.CAPTIONPOSITION),f=s.one(u.HEADERS),l=s.one(u.BORDERS
+),c=s.one(u.BORDERSTYLE),h=s.all(u.BORDERCOLOURS),p=s.one(u.BORDERSIZE),d=s.all(u.BACKGROUNDCOLOURS),v=s.one(u.WIDTH),m=this._lastTarget.ancestor("table"),g=m.one("caption"),y,b;g?o.set("value",g.getHTML()):o.set("value",""),v&&m.getStyle("width").indexOf("px")===-1&&v.set("value",parseInt(m.getStyle("width"),10)),a&&g&&g.getAttribute("style")?a.set("value",g.getStyle("caption-side")):a.set("value",""),m.getStyle("backgroundColor")&&this.get("allowBackgroundColour")&&(y=e.Color.toHex(m.getStyle("backgroundColor")),b=d.filter('[value="'+y+'"]'),b&&b.set("checked",!0));if(this.get("allowBorders")){var w="default",E=this._getBorderConfiguration(m);E?w="outer":(E=this._getBorderConfiguration(m.one("td")),E&&(w="all"));if(E){var S=E.borderStyle||r.BORDERSTYLE,x=E.borderWidth||r.BORDERWIDTH;c.set("value",S),p.set("value",x),l.set("value",w),y=E.borderColor,b=h.filter('[value="'+y+'"]'),b&&b.set("checked",!0)}}var T="columns";m.one('th[scope="row"]')&&(T="rows",m.one('th[scope="col"]')&&(T="both")),f.set("value",T),t.set("bodyContent",s).show(),this._updateAvailableSettings()},_deleteColumn:function(){var t=this._getColumnIndex(this._lastTarget),n=this._lastTarget.ancestor("table"),r=n.all("tr"),i=new e.NodeList,s=!1;r.each(function(e){var n=e.all("td, th"),r=n.item(t);r.get("tagName")==="TD"&&(s=!0),i.push(r)}),s&&i.remove(!0),this.markUpdated()},_addRowAfter:function(){var t=this._lastTarget.ancestor("tr"),n=this._lastTarget.ancestor("table").one("tbody");n||(n=this._lastTarget.ancestor("table"));var r=n.one("tr");r||(r=this._lastTarget.ancestor("table").one("tr"));if(!r)return;var i=r.cloneNode(!0);i.all("th, td").each(function(t){if(t.get("tagName")==="TH"&&t.getAttribute("scope")!=="row"){var n=e.Node.create("<td></td>");t.replace(n),t=n}t.setHTML("&nbsp;")}),t.ancestor("thead")?(t=r,n.insert(i,t)):t.insert(i,"after"),this.markUpdated()},_addColumnAfter:function(){var t=this._findColumnCells(),n=!0,r=t.next;t.next.size()<=0&&(n=!1,r=t.current),e.each(r,function(e){var t=e.cloneNode();t.setHTML("&nbsp;"),n?e.get("parentNode").insert(t,e):(e.get("parentNode").insert(t,e),e.swap(t))},this),this.markUpdated()}},{ATTRS:{allowBorders:{value:!0},borderStyles:{value:["none","solid","dashed","dotted"]},allowBackgroundColour:{value:!0},allowWidth:{value:!0},allowStyling:{readOnly:!0,getter:function(){return this.get("allowBorders")||this.get("allowBackgroundColour")||this.get("allowWidth")}},availableColors:{value:["#FFFFFF","#EF4540","#FFCF35","#98CA3E","#7D9FD3","#333333"],readOnly:!0}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-editor_atto-menu","event","event-valuechange"]});
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
index e56ea6650df..7bc7a43a219 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
@@ -35,7 +35,7 @@ YUI.add('moodle-atto_table-button', function (Y, NAME) {
 
 var COMPONENT = 'atto_table',
     DEFAULT = {
-        BORDERSTYLE: 'inherit',
+        BORDERSTYLE: 'none',
         BORDERWIDTH: '1'
     },
     DIALOGUE = {
@@ -84,52 +84,45 @@ var COMPONENT = 'atto_table',
                         '<option value="all">{{get_string "all" component}}' + '</option>' +
                     '</select>' +
                     '<br>' +
-                    '{{#if allowBorderStyles}}' +
-                        '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
-                        '{{get_string "borderstyles" component}}</label>' +
-                        '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
-                            '<option value="inherit">{{get_string "inherit" component}}</option>' +
-                            '{{#each borderStyles}}' +
-                                '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
-                            '{{/each}}' +
-                        '</select>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderSize}}' +
-                        '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
-                        '{{get_string "bordersize" component}}</label>' +
-                        '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
-                        'type="number" value="1" size="8" min="1" max="50"/>' +
-                        '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderColour}}' +
-                        '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
-                        '{{get_string "bordercolour" component}}</label>' +
-                        '<div id="{{elementid}}_atto_table_bordercolour"' +
-                        'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
-                            '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
-                            'style="background-color:transparent;color:transparent">' +
+                    '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
+                    '{{get_string "borderstyles" component}}</label>' +
+                    '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
+                        '{{#each borderStyles}}' +
+                            '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
+                        '{{/each}}' +
+                    '</select>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
+                    '{{get_string "bordersize" component}}</label>' +
+                    '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
+                    'type="number" value="1" size="8" min="1" max="50"/>' +
+                    '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
+                    '{{get_string "bordercolour" component}}</label>' +
+                    '<div id="{{elementid}}_atto_table_bordercolour"' +
+                    'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
+                        '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
+                        'style="background-color:transparent;color:transparent">' +
 
-                                '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
-                                'type="radio" name="borderColour" value="none" checked="checked"'+
-                                'title="{{get_string "themedefault" component}}"></input>' +
+                            '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
+                            'type="radio" name="borderColour" value="none" checked="checked"'+
+                            'title="{{get_string "themedefault" component}}"></input>' +
 
-                                '{{get_string "themedefault" component}}' +
+                            '{{get_string "themedefault" component}}' +
+                        '</label>' +
+                        '{{#each availableColours}}' +
+                            '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                            'style="background-color:{{this}};color:{{this}}">' +
+
+                                '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                                'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
+
+                                '{{this}}' +
                             '</label>' +
-                            '{{#each availableColours}}' +
-                                '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                'style="background-color:{{this}};color:{{this}}">' +
-
-                                    '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                    'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
-
-                                    '{{this}}' +
-                                '</label>' +
-                            '{{/each}}' +
-                        '</div>' +
-                        '<br>' +
-                    '{{/if}}' +
+                        '{{/each}}' +
+                    '</div>' +
+                    '<br>' +
                 '{{/if}}' +
                 '{{#if allowBackgroundColour}}' +
                     '<label for="{{elementid}}_atto_table_backgroundcolour" class="sameline">' +
@@ -162,7 +155,8 @@ var COMPONENT = 'atto_table',
                 '{{#if allowWidth}}' +
                     '<label for="{{elementid}}_atto_table_width" class="sameline">' +
                     '{{get_string "width" component}}</label>' +
-                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
+                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" ' +
+                        'type="number" min="0" max="100"/>' +
                     '<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
                     '<br>' +
                 '{{/if}}' +
@@ -346,10 +340,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
                 nonedit: !edit,
                 allowStyling: this.get('allowStyling'),
                 allowBorders: allowBorders,
-                allowBorderStyles: this.get('allowBorderStyles'),
                 borderStyles: this.get('borderStyles'),
-                allowBorderSize: this.get('allowBorderSize'),
-                allowBorderColour: this.get('allowBorderColour'),
                 allowBackgroundColour: this.get('allowBackgroundColour'),
                 availableColours: this.get('availableColors'),
                 allowWidth: this.get('allowWidth')
@@ -386,6 +377,10 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             borderColour    = tableForm.all('[name="borderColour"]'),
             disabledValue   = 'removeAttribute';
 
+        if (!enableBorders) {
+            return;
+        }
+
         if (enableBorders.get('value') === 'default') {
             disabledValue = 'setAttribute';
         }
@@ -1402,16 +1397,6 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             value: true
         },
 
-        /**
-         * Whether or not to allow style of borders
-         *
-         * @attribute allowBorderStyle
-         * @type Boolean
-         */
-        allowBorderStyles: {
-            value: true
-        },
-
         /**
          * What border styles to allow
          *
@@ -1420,38 +1405,11 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
          */
         borderStyles: {
             value: [
+                'none',
                 'solid',
                 'dashed',
                 'dotted'
-            ],
-            setter: function(value) {
-                if (value) {
-                    return value.replace(/ /g,'').split(',');
-                } else {
-                    // Not a valid value - revert to default value.
-                    return Y.Attribute.INVALID_VALUE;
-                }
-            }
-        },
-
-        /**
-         * Whether or not to allow border size
-         *
-         * @attribute allowBorderSize
-         * @type Boolean
-         */
-        allowBorderSize: {
-            value: true
-        },
-
-        /**
-         * Whether or not to allow colourizing borders
-         *
-         * @attribute allowBorderColours
-         * @type Boolean
-         */
-        allowBorderColour: {
-            value: true
+            ]
         },
 
         /**
diff --git a/lib/editor/atto/plugins/table/yui/src/button/js/button.js b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
index b344c7a5eab..fb35f13306f 100644
--- a/lib/editor/atto/plugins/table/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
@@ -33,7 +33,7 @@
 
 var COMPONENT = 'atto_table',
     DEFAULT = {
-        BORDERSTYLE: 'inherit',
+        BORDERSTYLE: 'none',
         BORDERWIDTH: '1'
     },
     DIALOGUE = {
@@ -82,52 +82,45 @@ var COMPONENT = 'atto_table',
                         '<option value="all">{{get_string "all" component}}' + '</option>' +
                     '</select>' +
                     '<br>' +
-                    '{{#if allowBorderStyles}}' +
-                        '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
-                        '{{get_string "borderstyles" component}}</label>' +
-                        '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
-                            '<option value="inherit">{{get_string "inherit" component}}</option>' +
-                            '{{#each borderStyles}}' +
-                                '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
-                            '{{/each}}' +
-                        '</select>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderSize}}' +
-                        '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
-                        '{{get_string "bordersize" component}}</label>' +
-                        '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
-                        'type="number" value="1" size="8" min="1" max="50"/>' +
-                        '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
-                        '<br>' +
-                    '{{/if}}' +
-                    '{{#if allowBorderColour}}' +
-                        '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
-                        '{{get_string "bordercolour" component}}</label>' +
-                        '<div id="{{elementid}}_atto_table_bordercolour"' +
-                        'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
-                            '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
-                            'style="background-color:transparent;color:transparent">' +
+                    '<label for="{{elementid}}_atto_table_borderstyle" class="sameline">' +
+                    '{{get_string "borderstyles" component}}</label>' +
+                    '<select name="borderstyles" class="{{CSS.BORDERSTYLE}}" id="{{elementid}}_atto_table_borderstyle">' +
+                        '{{#each borderStyles}}' +
+                            '<option value="' + '{{this}}' + '">' + '{{get_string this ../component}}' + '</option>' +
+                        '{{/each}}' +
+                    '</select>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordersize" class="sameline">' +
+                    '{{get_string "bordersize" component}}</label>' +
+                    '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" class="{{CSS.BORDERSIZE}}"' +
+                    'type="number" value="1" size="8" min="1" max="50"/>' +
+                    '<label style="display: inline-block;">{{CSS.BORDERSIZEUNIT}}</label>' +
+                    '<br>' +
+                    '<label for="{{elementid}}_atto_table_bordercolour" class="sameline">' +
+                    '{{get_string "bordercolour" component}}</label>' +
+                    '<div id="{{elementid}}_atto_table_bordercolour"' +
+                    'class="{{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
+                        '<label class="hideborder" for="{{../elementid}}_atto_table_bordercolour_-1"' +
+                        'style="background-color:transparent;color:transparent">' +
 
-                                '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
-                                'type="radio" name="borderColour" value="none" checked="checked"'+
-                                'title="{{get_string "themedefault" component}}"></input>' +
+                            '<input id="{{../elementid}}_atto_table_bordercolour_-1"' +
+                            'type="radio" name="borderColour" value="none" checked="checked"'+
+                            'title="{{get_string "themedefault" component}}"></input>' +
 
-                                '{{get_string "themedefault" component}}' +
+                            '{{get_string "themedefault" component}}' +
+                        '</label>' +
+                        '{{#each availableColours}}' +
+                            '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                            'style="background-color:{{this}};color:{{this}}">' +
+
+                                '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
+                                'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
+
+                                '{{this}}' +
                             '</label>' +
-                            '{{#each availableColours}}' +
-                                '<label for="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                'style="background-color:{{this}};color:{{this}}">' +
-
-                                    '<input id="{{../elementid}}_atto_table_bordercolour_{{@index}}"' +
-                                    'type="radio" name="borderColour" value="' + '{{this}}' + '" title="{{this}}">' +
-
-                                    '{{this}}' +
-                                '</label>' +
-                            '{{/each}}' +
-                        '</div>' +
-                        '<br>' +
-                    '{{/if}}' +
+                        '{{/each}}' +
+                    '</div>' +
+                    '<br>' +
                 '{{/if}}' +
                 '{{#if allowBackgroundColour}}' +
                     '<label for="{{elementid}}_atto_table_backgroundcolour" class="sameline">' +
@@ -160,7 +153,8 @@ var COMPONENT = 'atto_table',
                 '{{#if allowWidth}}' +
                     '<label for="{{elementid}}_atto_table_width" class="sameline">' +
                     '{{get_string "width" component}}</label>' +
-                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
+                    '<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" ' +
+                        'type="number" min="0" max="100"/>' +
                     '<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
                     '<br>' +
                 '{{/if}}' +
@@ -344,10 +338,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
                 nonedit: !edit,
                 allowStyling: this.get('allowStyling'),
                 allowBorders: allowBorders,
-                allowBorderStyles: this.get('allowBorderStyles'),
                 borderStyles: this.get('borderStyles'),
-                allowBorderSize: this.get('allowBorderSize'),
-                allowBorderColour: this.get('allowBorderColour'),
                 allowBackgroundColour: this.get('allowBackgroundColour'),
                 availableColours: this.get('availableColors'),
                 allowWidth: this.get('allowWidth')
@@ -384,6 +375,10 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             borderColour    = tableForm.all('[name="borderColour"]'),
             disabledValue   = 'removeAttribute';
 
+        if (!enableBorders) {
+            return;
+        }
+
         if (enableBorders.get('value') === 'default') {
             disabledValue = 'setAttribute';
         }
@@ -1400,16 +1395,6 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
             value: true
         },
 
-        /**
-         * Whether or not to allow style of borders
-         *
-         * @attribute allowBorderStyle
-         * @type Boolean
-         */
-        allowBorderStyles: {
-            value: true
-        },
-
         /**
          * What border styles to allow
          *
@@ -1418,38 +1403,11 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
          */
         borderStyles: {
             value: [
+                'none',
                 'solid',
                 'dashed',
                 'dotted'
-            ],
-            setter: function(value) {
-                if (value) {
-                    return value.replace(/ /g,'').split(',');
-                } else {
-                    // Not a valid value - revert to default value.
-                    return Y.Attribute.INVALID_VALUE;
-                }
-            }
-        },
-
-        /**
-         * Whether or not to allow border size
-         *
-         * @attribute allowBorderSize
-         * @type Boolean
-         */
-        allowBorderSize: {
-            value: true
-        },
-
-        /**
-         * Whether or not to allow colourizing borders
-         *
-         * @attribute allowBorderColours
-         * @type Boolean
-         */
-        allowBorderColour: {
-            value: true
+            ]
         },
 
         /**