diff --git a/admin/lang.php b/admin/lang.php
index 53be0cd88dd..37ace54e982 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -822,7 +822,7 @@
                 echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
                 echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                 echo '<input type="hidden" name="mode" value="helpfiles" />';
-                echo "<div align=\"center\">\n";
+                echo "<div class='mdl-align'>\n";
                 echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">";
                 if (file_exists("$saveto/$currentfile")) {
                     echo htmlspecialchars(file_get_contents("$saveto/$currentfile"));
@@ -842,7 +842,7 @@
             if (is_readable("$altdir/$currentfile")) {
                 // show the content of the same help file in alternative location
                 echo '<fieldset><legend>'.$straltdirtitle.'</legend>';
-                echo "<div align=\"center\">\n";
+                echo "<div class='mdl-align'>\n";
                 echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
                 if (file_exists("$altdir/$currentfile")) {
                     echo htmlspecialchars(file_get_contents("$altdir/$currentfile"));
@@ -869,7 +869,7 @@
                 echo '<fieldset><legend>'.$strlangmasterenglish;
                 helpbutton('langpackages', $strlangmasterenglish);
                 echo '</legend>';
-                echo "<div align=\"center\">\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
+                echo "<div class='mdl-align'>\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
                 echo htmlspecialchars(file_get_contents($ensrc));
                 echo "</textarea>\n</div>\n";
                 $preview_url = lang_help_preview_url($currentfile, true, 'en_utf8');   // do not display en_utf8_local
diff --git a/blog/rsslib.php b/blog/rsslib.php
index dd91f265b50..28bac957a62 100755
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -40,7 +40,7 @@
 
         require_once($CFG->libdir.'/filelib.php');
         $path = get_file_url($path, null, 'rssfile');
-        print '<div align="right"><a href="'. $path .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
+        print '<div class="mdl-right"><a href="'. $path .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
 
     }
 
diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php
index 062fa4f041d..470a8a788a3 100755
--- a/enrol/authorize/enrol_form.php
+++ b/enrol/authorize/enrol_form.php
@@ -20,7 +20,7 @@ class enrol_authorize_form extends moodleform
         $mform->addElement('header', 'general', get_string('paymentrequired'));
         $othermethodstr = $this->other_method_available($paymentmethod);
         if ($othermethodstr) {
-            $mform->addElement('static', '', '<div align="right">' . $othermethodstr . '</div>', '');
+            $mform->addElement('static', '', '<div class="mdl-right">' . $othermethodstr . '</div>', '');
         }
 
         $mform->addElement('hidden', 'id', $course->id);
diff --git a/lib/adodb/adodb-perf.inc.php b/lib/adodb/adodb-perf.inc.php
index cd666dc50df..0790a4a4159 100644
--- a/lib/adodb/adodb-perf.inc.php
+++ b/lib/adodb/adodb-perf.inc.php
@@ -752,7 +752,7 @@ Committed_AS:   348732 kB
 			echo $this->Tables(); break;
 		}
 		global $ADODB_vers;
-		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
+		echo "<p><div class='mdl-align'><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
 	}
 	
 	/*
@@ -1086,4 +1086,4 @@ Committed_AS:   348732 kB
     // end hack 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/exercise/locallib.php b/mod/exercise/locallib.php
index e7a12fbd662..20efbff7885 100644
--- a/mod/exercise/locallib.php
+++ b/mod/exercise/locallib.php
@@ -2869,7 +2869,7 @@ function exercise_print_upload_form($exercise) {
         error("Course Module ID was incorrect");
     }
 
-    echo "<div align=\"center\">";
+    echo "<div class='mdl-align'>";
     echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"upload.php\">";
     echo " <input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
     require_once($CFG->dirroot.'/lib/uploadlib.php');
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 569f3519220..b943b78e250 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -718,9 +718,9 @@ function forum_cron() {
                         }
                     }
                     if ($canunsubscribe) {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
                     } else {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
                     }
                     $posthtml .= '<hr size="1" noshade="noshade" /></p>';
                 }
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 4bb088fb1d6..55fa3052870 100644
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -383,7 +383,7 @@ class resource_file extends resource_base {
             $options = new object();
             $options->para = false;
             if (!empty($localpath)) {  // Show some help
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
             }
@@ -456,7 +456,7 @@ class resource_file extends resource_base {
             $options->para = false;
             echo '<div class="summary">'.format_text($resource->summary, FORMAT_HTML, $options).'</div>';
             if (!empty($localpath)) {  // Show some help
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'),
                         get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
@@ -682,7 +682,7 @@ class resource_file extends resource_base {
 
         } else {              // Display the resource on it's own
             if (!empty($localpath)) {   // Show a link to help work around browser security
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'),
                         get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index ccd8445b674..19caa1fae1b 100644
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -375,7 +375,7 @@ function display() {
 
         echo '<div class="summary">'.format_text($resource->summary, FORMAT_HTML, $formatoptions).'</div>';
         if (!empty($localpath)) {  // Show some help
-            echo '<div align="right" class="helplink">';
+            echo '<div class="mdl-right helplink">';
             link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
             echo '</div>';
         }
@@ -489,7 +489,7 @@ function display() {
 
     } else {              // Display the resource on it's own
         if (!empty($localpath)) {   // Show a link to help work around browser security
-            echo '<div align="right" class="helplink">';
+            echo '<div class="mdl-right helplink">';
             link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
             echo '</div>';
             echo "<center><p>(<a href=\"$fullurl\">$fullurl</a>)</p></center>";
diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index 6b38174ae73..01dbdb936c6 100644
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -1639,7 +1639,7 @@ function ewiki_page_edit_preview(&$data) {
    $preview_text=$GLOBALS["ewiki_plugins"]["render"][0]($_REQUEST["content"], 1, EWIKI_ALLOW_HTML || (@$data["flags"]&EWIKI_DB_F_HTML));
    return( '<div class="preview">'
            . "<hr noshade>"
-           . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
+           . "<div class='mdl-right'>" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
            . format_text($preview_text, $moodle_format)
            . "<br /><br /><hr noshade><br />"
            . "</div>"
@@ -1659,7 +1659,7 @@ function ewiki_control_links($id, &$data, $action) {
    }
 
    $o = "\n"
-      . '<div align="right" class="action-links control-links">'
+      . '<div class="mdl-right action-links control-links">'
       . "\n<br />\n"
       . "<hr noshade>" . "\n";
 
@@ -3587,4 +3587,4 @@ function ewiki_database_mysql($action, &$args, $sw1, $sw2) {
    return($r);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/question/type/datasetdependent/datasetdefinitions_form.php b/question/type/datasetdependent/datasetdefinitions_form.php
index 26935acc678..8bacbb85561 100644
--- a/question/type/datasetdependent/datasetdefinitions_form.php
+++ b/question/type/datasetdependent/datasetdefinitions_form.php
@@ -50,7 +50,7 @@ class question_dataset_dependent_definitions_form extends moodleform {
         $datadefscat= array();
         $datadefscat  = $this->qtypeobj->get_dataset_definitions_category($this->question);
         $datasetmenus = array();
-        $label = "<div align=\"center\">".get_string('datasetrole', 'qtype_datasetdependent','numerical')."</div>";
+        $label = "<div class='mdl-align'>".get_string('datasetrole', 'qtype_datasetdependent','numerical')."</div>";
         $mform->addElement('html', $label);// explaining the role of datasets so other strings can be shortened
         $mform->addElement('header', 'mandatoryhdr', get_string('mandatoryhdr', $stringfile));
         $labelsharedwildcard = get_string("sharedwildcard", "qtype_datasetdependent");
@@ -129,4 +129,4 @@ class question_dataset_dependent_definitions_form extends moodleform {
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index c8d5ac3d6ba..49077db3c57 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -108,6 +108,12 @@ h6.main {
 .mdl-align {
   text-align: center;
 }
+.mdl-left {
+  text-align: left;
+}
+.mdl-right {
+  text-align: right;
+}
 
 .continuebutton {
   text-align: center;