From 0665c52765abcd3b63df45de1f175c6e8e176a80 Mon Sep 17 00:00:00 2001
From: Pat Kira <pat.kira@catalyst.net.nz>
Date: Tue, 15 Sep 2015 17:12:49 +1200
Subject: [PATCH] A lot of minor styling fixes (bug: 1465107)

behatnotneeded: Styling fixes only

Change-Id: I064dc0e6d859249ff3c58f7e576fca9287d779eb
---
 htdocs/account/institutions.php               |  2 +
 htdocs/admin/site/licenses.php                |  1 +
 htdocs/admin/site/networking.php              |  2 +-
 htdocs/admin/users/edit.php                   |  2 +-
 htdocs/artefact/annotation/lib.php            |  5 +-
 .../blocktype/recentposts/js/recentposts.js   | 19 ++--
 .../blog/lang/en.utf8/artefact.blog.php       |  2 +-
 htdocs/artefact/file/blocktype/html/lib.php   |  1 +
 .../file/blocktype/internalmedia/lib.php      | 13 +--
 htdocs/collection/views.json.php              |  2 +-
 htdocs/collection/views.php                   |  2 +-
 htdocs/group/addmembers.php                   |  2 +-
 htdocs/group/invite.php                       |  1 +
 htdocs/interaction/forum/topic.php            |  5 +-
 htdocs/js/customlayout.js                     |  2 +-
 htdocs/lang/en.utf8/admin.php                 |  4 +-
 htdocs/lib/group.php                          | 10 +--
 htdocs/lib/license.php                        |  4 +-
 htdocs/lib/objectionable.php                  |  2 +-
 .../pieforms/pieform/elements/fieldset.php    |  2 +-
 htdocs/search/elasticsearch/lib.php           |  2 +-
 .../sass/utilities/_theme-variables.scss      |  1 +
 htdocs/theme/raw/js/filebrowser.js            |  4 +-
 htdocs/theme/raw/pieforms/export.php          |  4 +-
 .../templates/annotationfeedbackview.tpl      | 11 +--
 .../recentposts/templates/recentposts.tpl     | 38 ++++----
 .../taggedposts/templates/taggedposts.tpl     | 52 +++++------
 .../templates/artefactchooser-element.tpl     | 13 ++-
 .../artefact/blog/templates/blog.tpl          | 15 ++--
 .../artefact/blog/templates/bloglist.tpl      |  2 +-
 .../artefact/blog/templates/index.tpl         |  2 +-
 .../artefact/blog/templates/viewposts.tpl     | 70 ++++++++-------
 .../blocktype/comment/templates/comment.tpl   |  2 +-
 .../comment/templates/commentlist.tpl         |  2 +-
 .../artefact/file/templates/form/filelist.tpl | 14 +--
 .../profileinfo/templates/content.tpl         |  4 +-
 .../templates/artefactchooser-element.tpl     |  6 +-
 .../html-artefactchooser-element.tpl          |  8 +-
 .../blocktype/plans/templates/content.tpl     |  4 +-
 .../templates/artefactchooser-element.tpl     |  4 +-
 .../artefact/plans/templates/taskrows.tpl     | 37 ++++----
 .../templates/artefactchooser-element.tpl     |  4 +-
 .../blocktype/externalfeed/templates/feed.tpl | 45 +++++-----
 .../groupmembers/templates/groupmembers.tpl   |  2 +-
 .../groupviews/templates/allsubmissions.tpl   |  8 +-
 .../groupviews/templates/groupviews.tpl       | 53 +++++------
 .../templates/groupviewssection.tpl           | 29 ++++---
 .../templates/sharedcollections.tpl           | 15 ++--
 .../groupviews/templates/sharedviews.tpl      |  9 +-
 .../blocktype/inbox/templates/inboxmr.tpl     | 15 +++-
 .../mygroups/templates/mygroupslist.tpl       | 11 +--
 .../myviews/templates/myviewspaginator.tpl    |  7 +-
 .../navigation/templates/navigation.tpl       | 20 +++--
 .../blocktype/newviews/templates/newviews.tpl | 26 +++---
 .../templates/latestforumposts.tpl            |  8 +-
 .../templates/recentforumposts.tpl            |  9 +-
 .../blocktype/wall/templates/inlineposts.tpl  |  2 +-
 .../interaction/forum/templates/index.tpl     | 11 ++-
 .../interaction/forum/templates/post.tpl      | 32 +++----
 .../forum/templates/simplepost.tpl            | 22 ++---
 .../interaction/forum/templates/topic.tpl     |  2 +-
 .../interaction/forum/templates/topics.tpl    | 46 +++++-----
 .../interaction/forum/templates/view.tpl      | 75 ++++++++--------
 htdocs/theme/raw/sass/_custom.scss            | 12 ++-
 htdocs/theme/raw/sass/_shame.scss             |  1 -
 .../theme/raw/sass/components/_arrow-bar.scss |  4 +-
 .../raw/sass/components/_artefactchooser.scss | 12 +++
 .../theme/raw/sass/components/_btn-group.scss | 44 +++++-----
 htdocs/theme/raw/sass/components/_btn.scss    |  1 +
 .../theme/raw/sass/components/_indicator.scss | 14 +--
 .../raw/sass/components/_list-group.scss      | 16 ++++
 htdocs/theme/raw/sass/components/_modal.scss  |  2 +-
 .../raw/sass/components/_pagination.scss      |  8 +-
 .../theme/raw/sass/components/_user-icon.scss | 16 +++-
 htdocs/theme/raw/sass/form/_form-group.scss   |  6 ++
 htdocs/theme/raw/sass/form/_form.scss         | 12 ++-
 .../theme/raw/sass/form/_site-messages.scss   | 11 ++-
 htdocs/theme/raw/sass/layout/_columns.scss    | 14 ++-
 htdocs/theme/raw/sass/layout/_layout.scss     | 20 ++++-
 .../raw/sass/layout/panel/_panel-body.scss    |  2 +-
 .../raw/sass/layout/panel/_panel-form.scss    |  2 +-
 .../raw/sass/layout/panel/_panel-items.scss   |  4 +
 .../theme/raw/sass/layout/panel/_panel.scss   |  6 +-
 htdocs/theme/raw/sass/lib/_draggable.scss     |  5 ++
 htdocs/theme/raw/sass/lib/_graph.scss         |  2 +-
 htdocs/theme/raw/sass/lib/_tinymce.scss       |  4 +-
 htdocs/theme/raw/sass/typography/_tables.scss |  6 +-
 .../raw/sass/typography/_typography.scss      |  6 +-
 htdocs/theme/raw/sass/utilities/_index.scss   |  1 +
 htdocs/theme/raw/templates/admin/index.tpl    |  2 +-
 .../admin/institutionuserstatssummary.tpl     |  4 +-
 .../raw/templates/admin/registersite.tpl      |  5 +-
 .../raw/templates/admin/site/licenses.tpl     | 17 ++--
 .../theme/raw/templates/admin/site/menu.tpl   | 15 ++--
 .../theme/raw/templates/admin/statistics.tpl  |  2 +
 htdocs/theme/raw/templates/admin/stats.tpl    |  6 +-
 .../raw/templates/admin/userstatssummary.tpl  |  2 +-
 .../raw/templates/admin/viewstatssummary.tpl  |  2 +-
 .../theme/raw/templates/collection/index.tpl  |  8 +-
 .../raw/templates/collection/views.json.tpl   |  8 +-
 .../theme/raw/templates/collection/views.tpl  |  8 +-
 htdocs/theme/raw/templates/collectionnav.tpl  |  9 +-
 htdocs/theme/raw/templates/form/emaillist.tpl |  6 +-
 htdocs/theme/raw/templates/group/group.tpl    | 33 ++++---
 htdocs/theme/raw/templates/group/invite.tpl   |  1 -
 .../templates/group/membersearchresults.tpl   | 87 ++++++++-----------
 .../theme/raw/templates/group/simplegroup.tpl | 12 ---
 .../theme/raw/templates/group/topicrows.tpl   |  6 +-
 htdocs/theme/raw/templates/group/topics.tpl   |  2 +-
 htdocs/theme/raw/templates/group/view.tpl     |  2 +-
 htdocs/theme/raw/templates/skin/index.tpl     |  8 +-
 htdocs/theme/raw/templates/user/user.tpl      | 18 ++--
 htdocs/theme/raw/templates/user/userfind.tpl  | 32 ++++---
 htdocs/theme/raw/templates/user/view.tpl      |  8 +-
 .../raw/templates/view/accesslistrow.tpl      | 12 +--
 htdocs/theme/raw/templates/view/blocks.tpl    |  8 +-
 htdocs/theme/raw/templates/view/delete.tpl    |  2 +-
 htdocs/theme/raw/templates/view/edit.tpl      |  2 +-
 .../theme/raw/templates/view/groupviews.tpl   |  2 +-
 htdocs/theme/raw/templates/view/share.tpl     |  8 +-
 .../raw/templates/view/sharedviewrows.tpl     |  6 +-
 .../theme/raw/templates/view/sharedviews.tpl  |  2 +-
 htdocs/theme/raw/templates/view/skin.tpl      |  6 +-
 htdocs/theme/raw/templates/view/view.tpl      |  4 +-
 htdocs/user/requestfriendship.php             |  2 +-
 htdocs/view/urls.php                          |  2 +-
 test/behat/features/blocktype/myviews.feature |  8 +-
 .../group/moving_pages_between_groups.feature |  6 +-
 128 files changed, 762 insertions(+), 671 deletions(-)
 create mode 100644 htdocs/theme/raw/sass/components/_artefactchooser.scss
 delete mode 100644 htdocs/theme/raw/templates/group/simplegroup.tpl

diff --git a/htdocs/account/institutions.php b/htdocs/account/institutions.php
index f82dffd27d..5f0d10c676 100644
--- a/htdocs/account/institutions.php
+++ b/htdocs/account/institutions.php
@@ -31,6 +31,7 @@ if (!empty($member)) {
             $elements[] = array(
                 'type' => 'submit',
                 'name' => '_leave_' . $i->institution,
+                'class' => 'btn-default',
                 'confirm' => get_string('reallyleaveinstitution'),
                 'title' => get_string('youareamemberof', 'mahara', $institutions[$i->institution]->displayname),
                 'value' => get_string('leaveinstitution')
@@ -83,6 +84,7 @@ if (!empty($requested)) {
         $elements[] = array(
             'type' => 'submit',
             'name' => '_cancelrequest_' . $i,
+            'class' => 'btn-default',
             'title' => get_string('youhaverequestedmembershipof', 'mahara',
                                   $institutions[$i]->displayname),
             'value' => get_string('cancelrequest')
diff --git a/htdocs/admin/site/licenses.php b/htdocs/admin/site/licenses.php
index 78934d073b..9f8afb18db 100644
--- a/htdocs/admin/site/licenses.php
+++ b/htdocs/admin/site/licenses.php
@@ -48,5 +48,6 @@ setpageicon($smarty, 'icon-legal');
 $smarty->assign('PAGEHEADING', TITLE);
 $smarty->assign('licenses', $licenses);
 $smarty->assign('extralicenses', $extralicenses);
+$smarty->assign('allowextralicenses', get_config('licenseallowcustom'));
 $smarty->assign('enabled', get_config('licensemetadata'));
 $smarty->display('admin/site/licenses.tpl');
diff --git a/htdocs/admin/site/networking.php b/htdocs/admin/site/networking.php
index 1456b30d2d..0020e6aa36 100644
--- a/htdocs/admin/site/networking.php
+++ b/htdocs/admin/site/networking.php
@@ -106,7 +106,7 @@ $networkingform = pieform(
                         'value' => 'submit'
                     ),
                     'deletesubmit' => array(
-                        'class' => 'btn-default',
+                        'class' => 'btn-default ptm',
                         'name' => 'submit', // must be called submit so we can access it's value
                         'type'  => 'button',
                         'usebuttontag' => true,
diff --git a/htdocs/admin/users/edit.php b/htdocs/admin/users/edit.php
index 4014c9db86..d4d69d45cc 100644
--- a/htdocs/admin/users/edit.php
+++ b/htdocs/admin/users/edit.php
@@ -600,7 +600,7 @@ if (empty($suspended)) {
             ),
             'reason' => array(
                 'type'        => 'textarea',
-                'class'       => 'in-modal',
+                'class'       => 'under-label',
                 'rows'        => 5,
                 'cols'        => 28,
                 'title'       => get_string('reason'),
diff --git a/htdocs/artefact/annotation/lib.php b/htdocs/artefact/annotation/lib.php
index 7f6afb9efa..3f7500f27a 100644
--- a/htdocs/artefact/annotation/lib.php
+++ b/htdocs/artefact/annotation/lib.php
@@ -1190,8 +1190,8 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
                 'submit'  => array(
                     'type'  => 'button',
                     'usebuttontag' => true,
-                    'value' => get_string('delete'),
                     'class' => 'btn-default',
+                    'value' => '<span class="icon icon-trash text-danger"></span><span class="sr-only">' . get_string('delete') . '</span>',
                     'elementtitle' => get_string('delete'),
                     'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
                     'name'  => 'delete_annotation_feedback_submit',
@@ -1761,7 +1761,8 @@ class ActivityTypeArtefactAnnotationAnnotationfeedback extends ActivityTypePlugi
         $this->message = strip_tags(str_shorten_html($body, 200, true));
         // Seen as things like emaildigest base the message on $this->message
         // we need to set the language for the $removedbyline here based on first user.
-        $user = $this->users[0];
+        $firstuser = key($this->users);
+        $user = $this->users[$firstuser];
         $lang = (empty($user->lang) || $user->lang == 'default') ? get_config('lang') : $user->lang;
 
         // Comment deleted notification
diff --git a/htdocs/artefact/blog/blocktype/recentposts/js/recentposts.js b/htdocs/artefact/blog/blocktype/recentposts/js/recentposts.js
index b1e6a1afd9..b7acda373d 100644
--- a/htdocs/artefact/blog/blocktype/recentposts/js/recentposts.js
+++ b/htdocs/artefact/blog/blocktype/recentposts/js/recentposts.js
@@ -1,14 +1,11 @@
 function addNewPostShortcut(blockid) {
-    forEach(
-        getElementsByTagAndClassName('a', 'btnshortcut', 'blockinstance_' + blockid),
-        function(a) {
-            disconnectAll(a);
-            connect(a, 'onclick', function(e) {
-                e.stop();
-                var p = getFirstParentByTagAndClassName(a, 'div', 'shortcut');
-                var blogselect = getFirstElementByTagAndClassName('select','select', p);
-                window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect.value,'_blank');
-            });
+    var addentry = jQuery('#blockinstance_' + blockid + ' .blockinstance-content');
+    addentry.find('a').first().click(function(e) {
+        e.preventDefault();
+        var blogselect = addentry.find('select').first().val();
+        if (!blogselect) {
+            blogselect = jQuery(this).find('span').first().attr('id').match( /\d+/);
         }
-    );
+        window.open(config.wwwroot + 'artefact/blog/post.php?blog=' + blogselect, '_blank');
+    });
 }
diff --git a/htdocs/artefact/blog/lang/en.utf8/artefact.blog.php b/htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
index 501c7a313e..9ebdac9242 100644
--- a/htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
+++ b/htdocs/artefact/blog/lang/en.utf8/artefact.blog.php
@@ -156,7 +156,7 @@ $string['enablemultipleblogstext'] = 'You have one journal. If you would like to
 $string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option activated. You can enable it on the <a href="%saccount/index.php">account settings</a> page.';
 
 $string['shortcutaddpost'] = 'Add a new entry to';
-$string['shortcutgo'] = 'Go';
+$string['shortcutadd'] = 'Add';
 $string['shortcutnewentry'] = 'New entry';
 
 $string['duplicatedblog'] = 'Duplicated journal';
diff --git a/htdocs/artefact/file/blocktype/html/lib.php b/htdocs/artefact/file/blocktype/html/lib.php
index b32f1ccebe..0af67b2983 100644
--- a/htdocs/artefact/file/blocktype/html/lib.php
+++ b/htdocs/artefact/file/blocktype/html/lib.php
@@ -95,6 +95,7 @@ class PluginBlocktypeHtml extends PluginBlocktype {
             'artefacttype'    => array('file'),
             'filetype'        => self::get_allowed_mimetypes(),
         );
+        $element['accept'] = implode(',', self::get_allowed_mimetypes());
         return $element;
     }
 
diff --git a/htdocs/artefact/file/blocktype/internalmedia/lib.php b/htdocs/artefact/file/blocktype/internalmedia/lib.php
index 1e6c765702..af28ef06aa 100644
--- a/htdocs/artefact/file/blocktype/internalmedia/lib.php
+++ b/htdocs/artefact/file/blocktype/internalmedia/lib.php
@@ -128,6 +128,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
             'artefacttype'    => array('file', 'audio', 'video'),
             'filetype'        => self::get_allowed_mimetypes(),
         );
+        $element['accept'] = implode(',', self::get_allowed_mimetypes());
         return $element;
     }
 
@@ -280,7 +281,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
                         'allowscriptaccess' => 'never',
                         'allownetworking' => 'never'
                        );
-        $html =  '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>
+        $html =  '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>
                <span class="blocktype_internalmedia_mp3" id="' . $id . '">('
                . get_string('flashanimation', 'blocktype.file/internalmedia') . ')</span>
                 <script type="application/javascript">
@@ -335,8 +336,8 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
 
         $html =  '<span class="blocktype_internalmedia_mp3" id="' . $id . '" style="display:block;width:'.$width.'px;height:'.$height.'px;"></span>';
         $html .= '<span id="' . $id . '_h">' . get_string('flashanimation', 'blocktype.file/internalmedia') . '</span>';
-        $html .= '<div class="ptm"><span class="icon icon-download prs"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
-        $html .= '<span class="text-muted"> ['.$filesize.'] </span></div>';
+        $html .= '<div class="ptm"><span class="icon icon-download prs"></span><span class="sr-only">'.get_string('Download', 'artefact.internal').'</span><a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a>';
+        $html .= '<span class="text-lighttone text-small"> ['.$filesize.'] </span></div>';
         $html .= '<script type="application/javascript">
                flowplayer("'.$id.'", "'.$playerurl.'", {
                    clip:  {
@@ -375,7 +376,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
         $mimetype = $artefact->get('filetype');
         $autostart = 'false';
 
-        return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
+        return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
     . '<span class="blocktype_internalmedia_real">
     <script type="application/javascript">
     //<![CDATA[
@@ -408,7 +409,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
         $mimetype = 'video/x-ms-wmv'; // hardcode this
         $autostart = 'false';
 
-        return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
+        return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
     . '<span class="mediaplugin mediaplugin_wmp">
     <object classid="CLSID:6BF52A52-394A-11d3-B153-00C04F79FAA6" ' . $size . '
       standby="Loading Microsoft(R) Windows(R) Media Player components..."
@@ -450,7 +451,7 @@ class PluginBlocktypeInternalmedia extends PluginBlocktype {
         $mimetype = $artefact->get('filetype');
         $autostart = 'false';
 
-        return '<a class="media-link" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
+        return '<a class="media-link text-small" href="' . $url . '">' . hsc($artefact->get('title')) . '</a><br>'
     . '<span class="mediaplugin mediaplugin_qt">
     <object classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
       codebase="http://www.apple.com/qtactivex/qtplugin.cab" ' . $size . '>
diff --git a/htdocs/collection/views.json.php b/htdocs/collection/views.json.php
index 1c243c32a7..7d15362dfc 100644
--- a/htdocs/collection/views.json.php
+++ b/htdocs/collection/views.json.php
@@ -140,7 +140,7 @@ if ($views) {
                     'usebuttontag' => true,
                     'class' => 'btn-link btn-sm',
                     'confirm' => get_string('viewconfirmremove', 'collection'),
-                    'value' => '<span class="icon icon-times text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>'                ),
+                    'value' => '<span class="icon icon-times icon-lg text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>'                ),
             ),
         ));
     }
diff --git a/htdocs/collection/views.php b/htdocs/collection/views.php
index 4f49c115b0..f123a2326e 100644
--- a/htdocs/collection/views.php
+++ b/htdocs/collection/views.php
@@ -110,7 +110,7 @@ if ($views) {
                     'usebuttontag' => true,
                     'class' => 'btn-link btn-sm',
                     'confirm' => get_string('viewconfirmremove', 'collection'),
-                    'value' => '<span class="icon icon-times text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>',
+                    'value' => '<span class="icon icon-times icon-lg text-danger"><span class="sr-only">' . get_string('remove') . '</span></span>',
                 ),
             ),
         ));
diff --git a/htdocs/group/addmembers.php b/htdocs/group/addmembers.php
index 31ba2675ef..24954dbc85 100644
--- a/htdocs/group/addmembers.php
+++ b/htdocs/group/addmembers.php
@@ -52,7 +52,7 @@ $form = pieform(array(
         ),
         'submit' => array(
             'type' => 'submit',
-            'class' => 'btn-default',
+            'class' => 'btn-primary',
             'value' => get_string('submit'),
         )
     )
diff --git a/htdocs/group/invite.php b/htdocs/group/invite.php
index a598446f66..639f9dfe7d 100644
--- a/htdocs/group/invite.php
+++ b/htdocs/group/invite.php
@@ -66,6 +66,7 @@ $form = pieform(array(
         ),
         'submit' => array(
             'type' => 'submitcancel',
+            'class' => 'btn-primary',
             'value' => array(get_string('invite', 'group'), get_string('cancel')),
             'goto' => profile_url($user),
         )
diff --git a/htdocs/interaction/forum/topic.php b/htdocs/interaction/forum/topic.php
index e142cb7e18..15359887fc 100644
--- a/htdocs/interaction/forum/topic.php
+++ b/htdocs/interaction/forum/topic.php
@@ -267,6 +267,7 @@ function renderpost($post, $indent, $mode) {
             'validatecallback' => 'postnotobjectionable_validate',
             'successcallback'  => 'postnotobjectionable_submit',
             'renderer' => 'div',
+            'class' => 'form-condensed',
             'plugintype' => 'interaction',
             'pluginname' => 'forum',
             'autofocus' => false,
@@ -277,7 +278,7 @@ function renderpost($post, $indent, $mode) {
                 ),
                 'text' => array(
                     'type' => 'html',
-                    'class' => 'postnotobjectionable pb0 pt0',
+                    'class' => 'postnotobjectionable',
                     'value' => get_string('postnotobjectionable', 'interaction.forum'),
                 ),
                 'submit' => array(
@@ -291,7 +292,7 @@ function renderpost($post, $indent, $mode) {
                 ),
                 'details' => array(
                     'type'         => 'fieldset',
-                    'class' => 'last',
+                    'class' => 'last mtm',
                     'collapsible'  => true,
                     'collapsed'    => true,
                     'legend'       => get_string('reporteddetails', 'interaction.forum'),
diff --git a/htdocs/js/customlayout.js b/htdocs/js/customlayout.js
index bf15ddd015..d5f58be0f1 100644
--- a/htdocs/js/customlayout.js
+++ b/htdocs/js/customlayout.js
@@ -19,7 +19,7 @@
             }
             else {
                 // wanring: classes are modified above for any subsequent button instances
-                $(newrow).append('<button name="removerow" class="pull-left btn btn-sm btn-default removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(this)"><span class="icon icon-lg icon-times text-danger"></span><span class="hidden-xs pls"> ' + get_string('removethisrow', 'view') + '</span></button>');
+                $(newrow).append('<button name="removerow" class="pull-left btn btn-sm btn-default removecustomrow_' + (numrows + 1) + '" onclick="CustomLayoutManager.customlayout_remove_row(this)"><span class="icon icon-lg icon-trash text-danger"></span><span class="hidden-xs pls"> ' + get_string('removethisrow', 'view') + '</span></button>');
             }
             $('#customrow_' + numrows).after(newrow);
             $('#viewlayout_customlayoutnumrows').val(numrows + 1);
diff --git a/htdocs/lang/en.utf8/admin.php b/htdocs/lang/en.utf8/admin.php
index c2bbad1466..50d0d803d9 100644
--- a/htdocs/lang/en.utf8/admin.php
+++ b/htdocs/lang/en.utf8/admin.php
@@ -266,8 +266,8 @@ $string['groupmemberaverage'] = 'On average, each user is in %s groups';
 $string['viewsperuser'] = 'Users who make pages have about %s pages each';
 $string['Cron'] = 'Cron';
 $string['runningnormally'] = 'Running normally';
-$string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
-$string['cronnotrunningsiteclosed'] = '<span class="error">Cron is not running.</span><br>The site is currently closed. Please re-open the site for the cron to run.';
+$string['cronnotrunning2'] = '<strong class="error text-danger">Cron is not running.</strong><br>See the <a href="http://wiki.mahara.org/System_Administrator\'s_Guide/Installing_Mahara">installation guide</a> for instructions on how to set it up. If you have already set up cron, one or more of its activities have failed to run recently.';
+$string['cronnotrunningsiteclosed1'] = '<strong class="error text-danger">Cron is not running.</strong><br>The site is currently closed. Please re-open the site for the cron to run.';
 $string['Loggedin'] = 'Logged in';
 $string['youraverageuser'] = 'Your average user...';
 $string['statsmaxfriends1'] = array(
diff --git a/htdocs/lib/group.php b/htdocs/lib/group.php
index cc863d43bd..7f541f4a85 100644
--- a/htdocs/lib/group.php
+++ b/htdocs/lib/group.php
@@ -1083,11 +1083,10 @@ function group_get_join_form($name, $groupid, $returnto='view') {
         'name' => $name,
         'successcallback' => 'joingroup_submit',
         'autofocus' => false,
-
         'elements' => array(
             'btngroup' => array(
                 'type'  => 'fieldset',
-                'class' => 'text-right btn-top-right btn-group btn-group-top',
+                'class' => 'group-request btn-top-right btn-group btn-group-top',
                 'elements'     => array(
                     'join' => array(
                         'type' => 'button',
@@ -1115,24 +1114,23 @@ function group_get_join_form($name, $groupid, $returnto='view') {
 function group_get_accept_form($name, $groupid, $returnto) {
     return pieform(array(
        'name'     => $name,
-       'class' => 'group-request',
        'renderer' => 'div',
        'successcallback' => 'group_invite_submit',
        'elements' => array(
            'btngroup' => array(
                 'type'  => 'fieldset',
-                'class' => 'text-right btn-top-right btn-group btn-group-top',
+                'class' => 'group-request btn-top-right btn-group btn-group-top',
                 'elements'     => array(
                     'accept' => array(
                         'type'  => 'button',
                         'usebuttontag' => true,
-                        'class' => 'btn-default',
+                        'class' => 'btn-default form-as-button pull-left',
                         'value' => '<span class="icon icon-lg icon-check text-success prs"></span> ' . get_string('acceptinvitegroup', 'group')
                     ),
                     'decline' => array(
                         'type'  => 'button',
                         'usebuttontag' => true,
-                        'class' => 'btn-default text-danger',
+                        'class' => 'btn-default form-as-button pull-left',
                         'value' => '<span class="icon icon-lg icon-ban text-danger prs"></span> ' . get_string('declineinvitegroup', 'group')
                     )
                 ),
diff --git a/htdocs/lib/license.php b/htdocs/lib/license.php
index 73bef515b6..07d74ef306 100644
--- a/htdocs/lib/license.php
+++ b/htdocs/lib/license.php
@@ -227,7 +227,7 @@ function license_form_files($prefix, $prefix2=null) {
         $rowattr = '';
     }
     else {
-        $rowattr = 'class="required"';
+        $rowattr = 'required';
     }
     $html = '';
     foreach (array(
@@ -236,7 +236,7 @@ function license_form_files($prefix, $prefix2=null) {
         $rendered['license_advanced']['elements'][$prefix . '_licensorurl'],
     ) as $e) {
         $helphtml = preg_replace('/files_filebrowser_(edit_)?licens/', 'licens', $e['helphtml']);
-        $html .= '<div class="form-group">' . $rowattr . '' . $e['labelhtml'] . '' .
+        $html .= '<div class="form-group'.' '.$rowattr.'">' . $e['labelhtml'] . '' .
                  '' . $e['html'] . $helphtml . '</div>';
         $rowattr = '';
     }
diff --git a/htdocs/lib/objectionable.php b/htdocs/lib/objectionable.php
index 3e6a4e5c43..306e7cbb08 100644
--- a/htdocs/lib/objectionable.php
+++ b/htdocs/lib/objectionable.php
@@ -27,7 +27,7 @@ function objection_form() {
 
     $form['elements']['message'] = array(
         'type'  => 'textarea',
-        'class' => 'in-modal',
+        'class' => 'under-label',
         'title' => get_string('complaint'),
         'rows'  => 5,
         'cols'  => 80,
diff --git a/htdocs/lib/pieforms/pieform/elements/fieldset.php b/htdocs/lib/pieforms/pieform/elements/fieldset.php
index d7ac04d5eb..5015ef9db9 100644
--- a/htdocs/lib/pieforms/pieform/elements/fieldset.php
+++ b/htdocs/lib/pieforms/pieform/elements/fieldset.php
@@ -74,7 +74,7 @@ function pieform_element_fieldset(Pieform $form, $element) {
             $legendcontent .= '<span class="icon icon-'.$element['iconclass'].' prl type-icon"> </span>';
         }
         $legendcontent .= Pieform::hsc($element['legend']);
-        $legendcontent .= '<span class="icon icon-chevron-down collapse-indicator pull-right"> </span> ';
+        $legendcontent .= '<span class="icon icon-chevron-down collapse-indicator right pull-right"> </span> ';
 
         $legendcontent .= '</a>';
     }
diff --git a/htdocs/search/elasticsearch/lib.php b/htdocs/search/elasticsearch/lib.php
index a2dfcc9562..58eb030998 100644
--- a/htdocs/search/elasticsearch/lib.php
+++ b/htdocs/search/elasticsearch/lib.php
@@ -299,7 +299,7 @@ class PluginSearchElasticsearch extends PluginSearch {
                 'type'         => 'textarea',
                 'rows'         => 10,
                 'cols'         => 100,
-                'class'        => 'in-modal',
+                'class'        => 'under-label',
                 'title'        => get_string('artefacttypemaplegend', 'search.elasticsearch'),
                 'description'  => get_string('artefacttypemapdescription', 'search.elasticsearch'),
                 'defaultvalue' => implode("\n", $artefacttypesmap_array),
diff --git a/htdocs/theme/default/sass/utilities/_theme-variables.scss b/htdocs/theme/default/sass/utilities/_theme-variables.scss
index efec74b255..ec82562180 100755
--- a/htdocs/theme/default/sass/utilities/_theme-variables.scss
+++ b/htdocs/theme/default/sass/utilities/_theme-variables.scss
@@ -10,3 +10,4 @@ $theme-accent-color:  #474220;
 
 $theme-text-lighttone-color: #888;
 $theme-text-midtone-color: #888;
+
diff --git a/htdocs/theme/raw/js/filebrowser.js b/htdocs/theme/raw/js/filebrowser.js
index 64e786452f..0394d935f4 100644
--- a/htdocs/theme/raw/js/filebrowser.js
+++ b/htdocs/theme/raw/js/filebrowser.js
@@ -21,11 +21,11 @@ jQuery(function($) {
         var selectfileTitle = $('.select-file legend a'),
             title = e.originalEvent.data.title;
 
-        // Display the file name 
+        // Display the file name
         if(selectfileTitle.find('.file-name').length > 0) {
             selectfileTitle.find('.file-name').text(' - ' + title);
         } else {
-            selectfileTitle.find('.collapse-indicator').before('<span class="metadata file-name"> - '+ title + '</span>');
+            selectfileTitle.find('.collapse-indicator').before('<span class="text-small text-midtone file-name"> - '+ title + '</span>');
         }
     }
 
diff --git a/htdocs/theme/raw/pieforms/export.php b/htdocs/theme/raw/pieforms/export.php
index a0f9b8d5c5..a9e325a743 100644
--- a/htdocs/theme/raw/pieforms/export.php
+++ b/htdocs/theme/raw/pieforms/export.php
@@ -9,7 +9,7 @@ return <<<EOF
 <div class="checkbox">
     {$element['html']}
     {$element['labelhtml']}
-    <div class="metadata with-label">
+    <div class="text-small text-lighttone with-label">
         {$element['description']}
         <a href="{$element['viewlink']}" class="viewlink text-small nojs-hidden-inline" target="_blank">{$strclicktopreview}</a>
     </div>
@@ -73,7 +73,7 @@ $row = $col = 0;
 $itemsinrow = 3;
 foreach ($elements as $key => $element) {
     if (substr($key, 0, 11) == 'collection_') {
-        $body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label metadata labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
+        $body[$row][$col] = '<div class="checkbox">' . $element['html'] . $element['labelhtml'] . '<p class="with-label text-small text-lighttone labeldescriptpreview">' . hsc($element['description']) . '</p></div>';
         $col++;
         if ($col % $itemsinrow == 0) {
             $row++;
diff --git a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationfeedbackview.tpl b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationfeedbackview.tpl
index 3e8d17206b..86e4afe00f 100644
--- a/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationfeedbackview.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/annotation/templates/annotationfeedbackview.tpl
@@ -1,9 +1,11 @@
 {if !$editing}
     <div id="annotationfeedbackview_{$blockid}" class="annotation-feedback">
-        <ul id="annotationfeedbacktable_{$blockid}"class="annotationfeedbacktable flush list-group list-group-lite list-unstyled">
-            {$annotationfeedback->tablerows|safe}
-        </ul>
-        {$annotationfeedback->pagination|safe}
+        {if $annotationfeedback != 0}
+            <ul id="annotationfeedbacktable_{$blockid}"class="annotationfeedbacktable flush list-group list-group-lite list-unstyled">
+                {$annotationfeedback->tablerows|safe}
+            </ul>
+            {$annotationfeedback->pagination|safe}
+        {/if}
         {if $allowfeedback}
         <div class="annotationfeedback">
             <a id="feedback_{$blockid}" class="placeannotationfeedback link-blocktype last" data-toggle="modal-docked" data-target="#annotation_feedback_{$blockid}" href="#">
@@ -12,7 +14,6 @@
             </a>
         </div>
         {/if}
-
         <div id="annotation_feedback_{$blockid}" class="feedbacktable modal modal-docked">
             <div class="modal-dialog modal-lg">
                 <div class="modal-content">
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl
index 6287b6a7b9..63c7e12366 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/recentposts/templates/recentposts.tpl
@@ -1,24 +1,7 @@
-<ul class="recentblogpost list-group list-group-link">
-{foreach from=$mostrecent item=post}
-    <li class="list-group-item list-group-item-link">
-        <h4 class="list-group-item-heading mb0">
-            <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}" class="">
-                {$post->title}
-                <span class="metadata">
-                    {str tag='postedin' section='blocktype.blog/recentposts'}
-                    {$post->parenttitle}
-                    {str tag='postedon' section='blocktype.blog/recentposts'}
-                    {$post->displaydate}
-                </span>
-            </a>
-        </h4>
-    </li>
-{/foreach}
-</ul>
 {if ($editing)}
     {if (count($blogs) == 1)}
         <a class="panel-footer {if (count($blogs) != 1)} hidden{/if}">
-            <span class="icon icon-plus prs"></span>
+            <span id="blog_{$blogs[0]->id}" class="icon icon-plus prs"></span>
             {str tag='shortcutnewentry' section='artefact.blog'}
         </a>
     {else}
@@ -33,10 +16,27 @@
             </select>
             <span class="input-group-btn">
                 <a class="btn btn-default btnshortcut">
-                    <span class="icon icon-plus prs"></span> {str tag='shortcutgo' section='artefact.blog'}
+                    <span class="icon icon-plus text-success prs"></span> {str tag='shortcutadd' section='artefact.blog'}
                 </a>
             </span>
         </div>
     </div>
     {/if}
 {/if}
+<div class="recentblogpost list-group">
+{foreach from=$mostrecent item=post}
+    <div class="list-group-item">
+        <h4 class="list-group-item-heading mb0">
+            <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}" class="">
+                {$post->title}
+            </a>
+            {str tag='postedin' section='blocktype.blog/recentposts'}
+            <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
+            <span class="metadata">
+                {str tag='postedon' section='blocktype.blog/recentposts'}
+                {$post->displaydate}
+            </span>
+        </h4>
+    </div>
+{/foreach}
+</div>
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
index d488a7e7d6..915b3fe5d1 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
@@ -1,6 +1,6 @@
 {if ($editing)}
-<div class="shortcut nojs-hidden-block mtl">
-    <div class="panel-footer mtl {if (count($blogs) == 1)}hidden{/if}">
+<div class="shortcut nojs-hidden-block">
+    <div class="panel-footer {if (count($blogs) == 1)}hidden{/if}">
         <label class="text">{str tag='shortcutaddpost' section='artefact.blog'} </label>
         <div class="input-group">
             <span class="picker">
@@ -9,8 +9,8 @@
             <input class="select" type="hidden" value="{$tagselect}">
             <span class="input-group-btn">
                 <a class="btn btnshortcut btn-default">
-                    <span class="icon icon-plus prs"></span>
-                    {str tag='shortcutgo' section='artefact.blog'}
+                    <span class="icon icon-plus text-success prs"></span>
+                    {str tag='shortcutadd' section='artefact.blog'}
                 </a>
             </span>
         </div>
@@ -22,7 +22,7 @@
 </div>
 {/if}
 
-<h4>
+<p class="taggedpost-title text-lighttone mtm">
     {$blockheading|clean_html|safe}
 {if $viewowner}
     {$tag} {str tag='by' section='artefact.blog'}
@@ -30,12 +30,12 @@
 {else}
     <a href="{$WWWROOT}tags.php?tag={$tag}&sort=name&type=text">{$tag}</a>
 {/if}
-</h4>
+</p>
 
 {if $configerror}
-    <span class="metadata">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
+    <span class="text-lighttone">{str tag='configerror' section='blocktype.blog/taggedposts'}</span>
 {elseif $badtag}
-    <span class="metadata">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
+    <span class="text-lighttone">{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}</span>
 {elseif $full}
 <div id="blogdescription">
     <div id="postlist_{$blockid}" class="postlist list-group list-group-unbordered">
@@ -109,23 +109,25 @@
     </div>
 </div>
 {else}
-<ul class="taggedposts">
+<div class="taggedposts list-group">
     {foreach from=$results item=post}
-    <li>
-        <strong>
-        <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$view}">{$post->title}</a>
-        </strong>
-        {str tag='postedin' section='blocktype.blog/taggedposts'}
-
-        {if $viewowner}
-        {$post->parenttitle}
-        {else}
-        <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&view={$view}">{$post->parenttitle}</a>
-        {/if}
-        <span class="postdetails">
-            {str tag='postedon' section='blocktype.blog/taggedposts'} {$post->displaydate}
-        </span>
-    </li>
+    <div class="list-group-item">
+        <h4 class="list-group-item-heading mb0">
+            <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}">
+                {$post->title}
+            </a>
+            {str tag='postedin' section='blocktype.blog/taggedposts'}
+            {if $viewowner}
+            {$post->parenttitle}
+            {else}
+            <a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
+            {/if}
+            <span class="metadata">
+                {str tag='postedon' section='blocktype.blog/taggedposts'}
+                {$post->displaydate}
+            </span>
+        </h4>
+    </div>
     {/foreach}
-</ul>
+</div>
 {/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/artefactchooser-element.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/artefactchooser-element.tpl
index dc3d220ef4..79a184207f 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/artefactchooser-element.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/artefactchooser-element.tpl
@@ -1,9 +1,14 @@
-<div class="checkbox fullwidth">
+<div class="artefactchooser-item list-group-item list-group-item-default">
     {$formcontrols|safe}
-    <label for="{$elementname}_{$artefact->id}">{$artefact->title}{if $artefact->draft} [{str tag=draft section=artefact.blog}]{/if}
-        <span class="metadata">{if $artefact->blog}({$artefact->blog}){/if}</span>
+    <label for="{$elementname}_{$artefact->id}">
+        {$artefact->title}
+        {if $artefact->draft} 
+        [{str tag=draft section=artefact.blog}]
+        {/if}
+        <span class="text-midtone text-small">{if $artefact->blog}({$artefact->blog}){/if}</span>
     </label>
     {if $artefact->description}
-    <div class="text-small with-label">{$artefact->description|clean_html|safe}</div>
+    <div class="text-small detail">
+        {$artefact->description|clean_html|safe}</div>
     {/if}
 </div>
\ No newline at end of file
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl
index bce7e99221..2115bc6e51 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/blog.tpl
@@ -1,9 +1,15 @@
 <div class="blog">
+    {if ($editing && $canaddpost)}
+        <a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">
+            <span class="icon icon-plus text-success prs"></span>
+            {str tag='shortcutnewentry' section='artefact.blog'}
+        </a>
+    {/if}
     {if !$options.hidetitle}
     <h2>{$artefacttitle|safe}</h2>
     {/if}
 
-    <div id="blogdescription" class="blogdescription ptl">{$description|clean_html|safe}
+    <div id="blogdescription" class="blogdescription ptm">{$description|clean_html|safe}
     {if $tags}
     <div class="tags pbl">
         <strong>{str tag=tags}:</strong> {list_tags owner=$owner tags=$tags}
@@ -32,11 +38,4 @@
     {literal}}{/literal});
     </script>
     {/if}
-
-    {if ($editing && $canaddpost)}
-        <a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}" target="_blank">
-            <span class="icon icon-plus prs"></span>
-            {str tag='shortcutnewentry' section='artefact.blog'}
-        </a>
-    {/if}
 </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
index 078676de58..a7fd65ffc3 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/bloglist.tpl
@@ -31,7 +31,7 @@
         </a>
         <div class="pull-right">
             {if $blog->locked}
-                {str tag=submittedforassessment section=view}
+                <span class="text-small">{str tag=submittedforassessment section=view}</span>
             {else}
             <a href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->id}" title="{str(tag=settingsspecific arg1=$blog->title)|escape:html|safe}" class="btn btn-default btn-sm">
                 <span class="icon icon-pencil mrs"></span>
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl
index 3c657ae650..0066606632 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/index.tpl
@@ -7,7 +7,7 @@
 </div>
 <div id="myblogs" class="rel mtxl ptxl">
     {if !$blogs->data}
-    <div>{str tag=youhavenoblogs section=artefact.blog}</div>
+    <p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
     {else}
 
     <div class="panel-items js-masonry" data-masonry-options='{ "itemSelector": ".panel" }'>
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/templates/viewposts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/templates/viewposts.tpl
index bc1a31ef91..596f51c515 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/templates/viewposts.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/templates/viewposts.tpl
@@ -17,41 +17,51 @@
             {/if}
         </div>
 
+        <div class="post-content mtl">
+            {$post->description|clean_html|safe}
+        </div>
+
         {if $post->files}
-        <ul class="attachment-incontent list-group list-group-unbordered pull-right mlm mtl">
-            <li class="list-group-item">
-                <span class="icon icon-paperclip icon-lg"></span>
-                <span>{str tag=attachedfiles section=artefact.blog}</span>
-            </li>
-            {foreach from=$post->files item=file}
-            <li class="list-group-item">
-                <a href="{$WWWROOT}artefact/artefact.php?artefact={$file->attachment}&view={$options.viewid}" class="outer-link icon-on-hover">
-                    <span class="sr-only">
-                        {str tag=Download section=artefact.file} {$file->title}
+        <div class="has-attachment panel panel-default collapsible mbm" id="blockpostfiles-{$post->id}">
+            <h5 class="panel-heading">
+                <a class="text-left pbm collapsed" data-toggle="collapse" href="#post-attach-{$post->id}" aria-expanded="false">
+                    <span class="icon icon-paperclip right"></span>
+                    <span class="text-small"> {str tag=attachedfiles section=artefact.blog} </span>
+                     <span class="metadata">
+                        ({$post->files|count})
                     </span>
+                    <span class="icon icon-chevron-down collapse-indicator pull-right"></span>
                 </a>
-                {if $file->icon}
-                <img src="{$file->icon}" alt="">
-                {else}
-                <span class="icon icon-{$file->artefacttype} icon-lg text-default"></span>
-                {/if}
-                <span class="title list-group-item-heading plm inline">
-                    <a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}&amp;view={$options.viewid}" class="inner-link">
-                        {$file->title}
-                        <span class="metadata"> -
-                            [{$file->size|display_size}]
+            </h5>
+            <div class="collapse" id="post-attach-{$post->id}">
+                <ul class="list-group mb0">
+                {foreach from=$post->files item=file}
+                    <li class="list-group-item">
+                        <a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}&amp;view={$options.viewid}" class="outer-link icon-on-hover">
+                            <span class="sr-only">
+                                {str tag=Download section=artefact.file} {$file->title}
+                            </span>
+                        </a>
+                        {if $file->icon}
+                        <img src="{$file->icon}" alt="">
+                        {else}
+                        <span class="icon icon-{$file->artefacttype} icon-lg text-default"></span>
+                        {/if}
+                        <span class="title plm inline">
+                            <a href="{$WWWROOT}artefact/artefact.php?artefact={$file->attachment}&view={$options.viewid}" class="inner-link">
+                                {$file->title}
+                                <span class="metadata"> -
+                                    [{$file->size|display_size}]
+                                </span>
+                            </a>
                         </span>
-                    </a>
-                </span>
-                <span class="icon icon-download icon-lg pull-right pts text-watermark icon-action"></span>
-            </li>
-            {/foreach}
-        </ul>
-        {/if}
-
-        <div class="post-content mtl">
-            {$post->description|clean_html|safe}
+                        <span class="icon icon-download icon-lg pull-right pts text-watermark icon-action"></span>
+                    </li>
+                {/foreach}
+                </ul>
+            </div>
         </div>
+        {/if}
 
         {if $options.viewid && $post->allowcomments}
             <div class="comments">
diff --git a/htdocs/theme/raw/plugintype/artefact/comment/blocktype/comment/templates/comment.tpl b/htdocs/theme/raw/plugintype/artefact/comment/blocktype/comment/templates/comment.tpl
index 47d849e5cf..978a45e150 100644
--- a/htdocs/theme/raw/plugintype/artefact/comment/blocktype/comment/templates/comment.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/comment/blocktype/comment/templates/comment.tpl
@@ -1,6 +1,6 @@
 {if $editing}
 <div class="panel-body">
-    <p class="metadata">{$editing}</p>
+    <p class="alert alert-info">{$editing}</p>
 </div>
 {elseif $feedback}
     {* Do not change the id because it is used by paginator.js *}
diff --git a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
index 20c74bfaf7..f9bacd91ce 100644
--- a/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/comment/templates/commentlist.tpl
@@ -65,7 +65,7 @@
                     >
                         <span class="icon icon-reply icon-lg"></span>
                         <span class="sr-only">{str tag=reply section=artefact.comment}</span>
-                    </a>
+                    </button>
                 {/if}
             </div>
         </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
index c31951671a..bac0b385b9 100644
--- a/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/file/templates/form/filelist.tpl
@@ -35,11 +35,13 @@
 
                     {if $file->isparent}
                         {if $file->artefacttype == 'folder'}
-                            <span class="pls icon-level-up icon icon-lg text-default">
-                            </span>
-                            <span class="sr-only">
-                                {str tag=folder section=artefact.file}:{$displaytitle}
-                            </span>
+                            <a href="{$querybase|safe}folder={$file->id}{if $owner}&owner={$owner}{if $ownerid}&ownerid={$ownerid}{/if}{/if}" id="changefolder-icon:{$file->id}" class="changefolder">
+                                <span class="pls icon-level-up icon icon-lg text-default">
+                                </span>
+                                <span class="sr-only">
+                                    {str tag=folder section=artefact.file}:{$displaytitle}
+                                </span>
+                            </a>
                         {/if}
                     {else}
                         {if $editable}
@@ -171,7 +173,7 @@
 
 {else}
 <div class="panel-body">
-    <p class="lead ptm pbm text-center">
+    <p class="no-results">
         {str tag=nofilesfound section=artefact.file}
     </p>
 </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/internal/blocktype/profileinfo/templates/content.tpl b/htdocs/theme/raw/plugintype/artefact/internal/blocktype/profileinfo/templates/content.tpl
index 98aa35d421..87c4d0ef4d 100644
--- a/htdocs/theme/raw/plugintype/artefact/internal/blocktype/profileinfo/templates/content.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/internal/blocktype/profileinfo/templates/content.tpl
@@ -9,7 +9,7 @@
     {$profileinfo.introduction|clean_html|safe}
 {/if}
 {if $profileinfo && (count($profileinfo) != 1 || !$profileinfo.introduction || !$profileinfo.socialprofiles)}
-    <ul class="unstyled">
+    <ul class="unstyled profile-info">
         {foreach from=$profileinfo key=key item=item}
             {if !in_array($key, array('introduction', 'socialprofiles'))}
                 <li><strong>{str tag=$key section=artefact.internal}:</strong> {$item|clean_html|safe}</li>
@@ -20,7 +20,7 @@
 
 {if $profileinfo.socialprofiles}
     <h4 class="sr-only">{str tag=socialprofiles section=artefact.internal}</h4>
-    <ul class="unstyled mtm">
+    <ul class="unstyled mtm profile-info">
         {foreach from=$profileinfo.socialprofiles item=item}
             <li><strong>{$item.description}:</strong>
                 {if $item.link}<a href="{$item.link}" title="{$item.link}" target="_blank">{/if}{$item.title|clean_html|safe}{if $item.link}</a>{/if}
diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/artefactchooser-element.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/artefactchooser-element.tpl
index b2f096ab6b..150da31a6f 100644
--- a/htdocs/theme/raw/plugintype/artefact/internal/templates/artefactchooser-element.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/artefactchooser-element.tpl
@@ -1,8 +1,8 @@
-<div class="checkbox">
+<div class="artefactchooser-item list-group-item list-group-item-default">
     {$formcontrols|safe}
-    <label class="pll" for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">
+    <label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">
         {if $artefact->description}
-        {$artefact->description} 
+        {$artefact->description}
         <span class="metadata">({str tag=$artefact->artefacttype section=artefact.internal})</span>
         {else}
         {str tag=$artefact->artefacttype section=artefact.internal}
diff --git a/htdocs/theme/raw/plugintype/artefact/internal/templates/html-artefactchooser-element.tpl b/htdocs/theme/raw/plugintype/artefact/internal/templates/html-artefactchooser-element.tpl
index 6a0cee17fe..b61455a17d 100644
--- a/htdocs/theme/raw/plugintype/artefact/internal/templates/html-artefactchooser-element.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/internal/templates/html-artefactchooser-element.tpl
@@ -3,10 +3,10 @@
     <label class="lead text-small mbs" for="{$elementname}_{$artefact->id}">
         {$artefact->title|str_shorten_text:60:true}
     </label>
-    {if $artefact->ownerurl}({str tag=by section=view}
-        <a href="{$artefact->ownerurl}" class="metadata">{$artefact->ownername}</a>)
+    {if $artefact->ownerurl}
+    <span class="text-small text-midtone">({str tag=by section=view} <a href="{$artefact->ownerurl}">{$artefact->ownername}</a>)</span>
     {/if}
-    <div class="with-label text-small" for="{$elementname}_{$artefact->id}">
-        {$artefact->description|str_shorten_html:80:true|strip_tags|safe}
+    <div class="text-small detail" for="{$elementname}_{$artefact->id}">
+        {$artefact->description|str_shorten_html:120:true|strip_tags|safe}
     </div>
 </div>
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
index 10dddddc1d..b03b4d3858 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/blocktype/plans/templates/content.tpl
@@ -5,9 +5,9 @@
     {/if}
 
     {if $tasks.data}
-        <ul id="tasklist_{$blockid}" class="list-group list-unstyled mbl">
+        <div id="tasklist_{$blockid}" class="list-group list-unstyled mbl">
             {$tasks.tablerows|safe}
-        </ul>
+        </div>
         {if $tasks.pagination}
         <div id="plans_page_container_{$blockid}" class="nojs-hidden-block ">
             {$tasks.pagination|safe}
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/artefactchooser-element.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/artefactchooser-element.tpl
index 3c0b67116d..851465e7e4 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/artefactchooser-element.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/artefactchooser-element.tpl
@@ -1,5 +1,5 @@
-<div class="fullwidth list-group-item">
+<div class="artefactchooser-item list-group-item list-group-item-default">
     {$formcontrols|safe}
     <label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">{$artefact->title|strip_tags|safe}</label>
-    <div class="with-label text-small">{$artefact->description|str_shorten_html|safe}</div>
+    <div class="text-small detail">{$artefact->description|str_shorten_html|safe}</div>
 </div>
\ No newline at end of file
diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
index 0f69988979..bd96429a48 100644
--- a/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/taskrows.tpl
@@ -1,13 +1,13 @@
 {foreach from=$tasks.data item=task}
     {if $task->completed == -1}
-        <li class="task-item plan_incomplete list-group-item {if $task->description}list-group-item-default{/if}">
+        <div class="task-item plan_incomplete list-group-item {if $task->description}list-group-item-default{/if}">
 
             {if $task->description}<a class="link-block collapsed" href="#expand-task-{$task->id}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}">{/if}
 
-                <span class="text-danger">
-                    <span class="icon icon-times icon-lg prs"></span>
-                    {$task->title} -
-                    <span class="metadata">
+                <span class="overdue-task">
+                    <span class="icon icon-times text-danger icon-lg prs"></span>
+                    <span class="text-danger">{$task->title}</span> -
+                    <span class="text-small text-lighttone">
                         {str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
                     </span>
                     {if $task->description}
@@ -17,8 +17,8 @@
             {if $task->description}</a>{/if}
 
             {if $task->description}
-            <div class="text-small collapse" id="expand-task-{$task->id}">
-                 <div class="panel-body">
+            <div class="collapse" id="expand-task-{$task->id}">
+                 <div class="panel-body pb0">
                     {$task->description|clean_html|safe}
                     {if $task->tags}
                     <p class="tags">
@@ -28,23 +28,23 @@
                 </div>
             </div>
             {/if}
-        </li>
+        </div>
     {else}
-        <li class="task-item list-group-item {if $task->description}list-group-item-default{/if}">
+        <div class="task-item list-group-item {if $task->description}list-group-item-default{/if}">
 
             {if $task->description}<a class="link-block collapsed" href="#expand-task-{$task->id}" data-toggle="collapse" aria-expanded="false" aria-controls="expand-task-{$task->id}">{/if}
 
-                <span class=" {if $task->completed == 1}text-success{/if} ">
+                <span class="complete-task">
                     {if $task->completed == 1}
                         <span class="icon icon-check-square-o icon-lg text-success prs"></span>
                         <span class="sr-only">{str tag=completed section=artefact.plans}</span>
                     {else}
-                        <span class="icon-square-o icon icon-lg text-lighttone prs icon-placeholder"></span>
+                        <span class="icon-square-o icon icon-lg text-lighttone prs"></span>
                         <span class="sr-only">{str tag=incomplete section=artefact.plans}</span>
                     {/if}
 
-                    {$task->title} -
-                    <span class="metadata">
+                    <span class="text-default">{$task->title}</span> -
+                    <span class="text-lighttone text-small">
                         {str tag='completiondate' section='artefact.plans'}: {$task->completiondate}
                     </span>
 
@@ -56,23 +56,20 @@
             {if $task->description}</a>{/if}
 
             {if $task->description}
-            <div class="text-small collapse" id="expand-task-{$task->id}">
-                <div class="panel-body">
+            <div class="collapse" id="expand-task-{$task->id}">
+                <div class="panel-body pb0">
 
                     {$task->description|clean_html|safe}
 
                     {if $task->tags}
                     <p class="tags">
-                        strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags}
+                        <strong>{str tag=tags}:</strong> {list_tags owner=$task->owner tags=$task->tags}
                     </p>
                     {/if}
 
                 </div>
             </div>
             {/if}
-
-
-
-        </li>
+        </div>
     {/if}
 {/foreach}
diff --git a/htdocs/theme/raw/plugintype/artefact/resume/templates/artefactchooser-element.tpl b/htdocs/theme/raw/plugintype/artefact/resume/templates/artefactchooser-element.tpl
index a4c54a537f..fde2e9a4ba 100644
--- a/htdocs/theme/raw/plugintype/artefact/resume/templates/artefactchooser-element.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/resume/templates/artefactchooser-element.tpl
@@ -1,5 +1,5 @@
-<div class="checkbox fullwidth">
+<div class="artefactchooser-item list-group-item list-group-item-default">
     {$formcontrols|safe}
     <label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">{str tag=$artefact->artefacttype section=artefact.resume}</label>
-    <div class="text-small with-label">{$artefact->description|str_shorten_html:100:true|strip_tags|safe}</div>
+    <div class="text-small detail">{$artefact->description|str_shorten_html:100:true|strip_tags|safe}</div>
 </div>
\ No newline at end of file
diff --git a/htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl b/htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl
index d50939ab09..c779655615 100644
--- a/htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/externalfeed/templates/feed.tpl
@@ -3,39 +3,40 @@
 
         {if $description && $description != $entries[0]->description}
         <div class="panel-body">
-            <div id="blocktype_externalfeed_desc" class="feed-decription">
+            <div id="blocktype_externalfeed_desc" class="feed-decription text-lighttone text-small">
                 {$description|clean_html|safe}
             </div>
          </div>
         {/if}
 
         {if $full}
-        <div class="list-group mb0">
-            {foreach from=$entries item=entry}
-            <div class="list-group-item">
-                {if $entry->link}<a href="{$entry->link}">{/if}
-
-                <h4 class="title feedtitle list-group-item-heading mb0">
-                    {$entry->title}
-                </h4>
-                <span class="postdetails metadata text-small">
-                    {if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
-                </span>
-
-                {if $entry->link}</a>{/if}
-                <div class="feedcontent mtl">{$entry->description|clean_html|safe}</div>
-             </div>
-            {/foreach}
-        <div>
+            <div class="list-group">
+                {foreach from=$entries item=entry}
+                <div class="list-group-item">
+                    {if $entry->link}<a href="{$entry->link}">{/if}
+
+                    <h4 class="title list-group-item-heading mb0">
+                        {$entry->title}
+                    </h4>
+                    <span class="postdetails metadata text-small">
+                        {if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
+                    </span>
+
+                    {if $entry->link}</a>{/if}
+                    <div class="feedcontent mtl text-small">{$entry->description|clean_html|safe}</div>
+                 </div>
+                {/foreach}
+            </div>
         {else}
-            <ol class="list-group mb0">
+            <ol class="list-group">
             {foreach from=$entries item=entry}
                 <li class="list-group-item {if $entry->link}list-group-item-link{/if}">
+
                 {if $entry->link}<a href="{$entry->link}">{/if}
 
-                {$entry->title}
+                <h4 class="list-group-item-heading text-inline">{$entry->title}</h4>
 
-                <span class="postdetails metadata">
+                <span class="postdetails text-small text-midtone">
                  - {if $entry->pubdate}{str tag=publishedon section=blocktype.externalfeed arg1=$entry->pubdate}{/if}
                 </span>
 
@@ -45,7 +46,7 @@
             </ol>
         {/if}
 
-        <div id="blocktype_externalfeed_lastupdate" class="postdetails text-right ptm mbm metadata">
+        <div id="blocktype_externalfeed_lastupdate" class="postdetails text-right text-small text-lighttone">
         {$lastupdated}
         </div>
     </div>
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/groupmembers.tpl b/htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/groupmembers.tpl
index db61451faf..1d4165cc8c 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/groupmembers.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupmembers/templates/groupmembers.tpl
@@ -5,7 +5,7 @@
             {$groupmembers.tablerows|safe}
         {/if}
         </div>
-        <a class="panel-footer" href="{$show_all.url}">
+        <a class="panel-footer text-small" href="{$show_all.url}">
             {$show_all.message}
             <span class="icon icon-arrow-circle-right mls"></span>
         </a>
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/allsubmissions.tpl b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/allsubmissions.tpl
index 800872e782..8b267c6890 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/allsubmissions.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/allsubmissions.tpl
@@ -3,10 +3,8 @@
         <a href="{$item.url}" class="outer-link">
             <span class="sr-only">{$item.name|str_shorten_text:60:true}</span>
         </a>
-
-        {$item.name|str_shorten_text:60:true}
-
-        <span class="owner metadata inner-link text-small"> -
+        <h5 class="text-inline">{$item.name|str_shorten_text:60:true}</h5>
+        <span class="owner metadata inner-link text-small">
             {str tag=by section=view}
             <a href="{$item.ownerurl}" class="text-success text-small">
             {$item.ownername}
@@ -14,7 +12,7 @@
         </span>
 
         {* submittedstatus == '2' is equivalent to PENDING_RELEASE *}
-        <div class="metadata mts text-small">
+        <div class="detail text-small text-midtone">
             {str tag=timeofsubmission section=view}:
             {$item.submittedtime|format_date}
 
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviews.tpl b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviews.tpl
index 33329d5220..6c3afe2806 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviews.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviews.tpl
@@ -1,12 +1,12 @@
 
 {if $groupviews}
     {if $groupviews.count > 0}
-        <ul id="groupviewlist" class="list-group list-unstyled list-group-unbordered mtm">
+        <ul id="groupviewlist" class="list-group allgroup-pages grouppages">
             {$groupviews.tablerows|safe}
         </ul>
 
         {if $groupviews.pagination}
-        <div id="groupviews_page_container" class="hidden pbm ptm">
+        <div id="groupviews_page_container" class="hidden pagination-container">
             {$groupviews.pagination|safe}
         </div>
         {/if}
@@ -21,7 +21,7 @@
         {/if}
     {else}
         <div class="panel-body">
-            {str tag=nogroupviewsyet section=view}
+            <span class="no-results text-small">{str tag=nogroupviewsyet section=view}</span>
         </div>
     {/if}
     <hr />
@@ -32,12 +32,13 @@
         {str tag="viewssharedtogroup" section="view"}:
     </h4>
     {if $sharedviews.count > 0}
-        <ul id="sharedviewlist" class="list-group list-unstyled list-group-unbordered">
+        <ul id="sharedviewlist" class="list-group grouppages">
             {$sharedviews.tablerows|safe}
         </ul>
 
         {if $sharedviews.pagination}
-            <div id="sharedviews_page_container" class="hidden pbm ptm">{$sharedviews.pagination|safe}
+            <div id="sharedviews_page_container" class="hidden pagination-container">
+                {$sharedviews.pagination|safe}
             </div>
         {/if}
 
@@ -51,10 +52,10 @@
         {/if}
     {else}
         <div class="panel-body">
-            {str tag=nosharedviewsyet section=view}
+            <span class="no-results text-small">{str tag=nosharedviewsyet section=view}</span>
         </div>
     {/if}
-    
+
     {if $sharedviews.pagination_js}
     <script>
         addLoadEvent(function() {literal}{{/literal}
@@ -72,12 +73,12 @@
         {str tag="collectionssharedtogroup" section="collection"}:
     </h4>
     {if $sharedcollections.count > 0}
-        <ul id="sharedcollectionlist" class="list-group list-unstyled list-group-unbordered">
+        <ul id="sharedcollectionlist" class="list-group grouppages">
             {$sharedcollections.tablerows|safe}
         </ul>
 
         {if $sharedcollections.pagination}
-            <div id="sharedcollections_page_container" class="hidden pbm ptm">
+            <div id="sharedcollections_page_container" class="hidden pagination-container">
             {$sharedcollections.pagination|safe}
             </div>
         {/if}
@@ -92,7 +93,7 @@
         {/if}
     {else}
         <div class="panel-body">
-            {str tag=nosharedcollectionsyet section=collection}
+            <span class="no-results text-small">{str tag=nosharedcollectionsyet section=collection}</span>
         </div>
     {/if}
     <hr />
@@ -103,11 +104,13 @@
         {str tag="submissionstogroup" section="view"}:
     </h4>
     {if $allsubmitted.count > 0}
-        <ul id="allsubmissionlist" class="list-group list-unstyled list-group-unbordered">
+        <ul id="allsubmissionlist" class="list-group grouppages">
             {$allsubmitted.tablerows|safe}
         </ul>
         {if $allsubmitted.pagination}
-            <div id="allsubmitted_page_container" class="hidden">{$allsubmitted.pagination|safe}</div>
+            <div id="allsubmitted_page_container" class="hidden pagination-container">
+                {$allsubmitted.pagination|safe}
+            </div>
         {/if}
         {if $allsubmitted.pagination_js}
         <script>
@@ -119,7 +122,7 @@
         {/if}
     {else}
         <div class="panel-body">
-            {str tag=nosubmittedviewscollectionsyet section=view}
+            <span class="no-results text-small">{str tag=nosubmittedviewscollectionsyet section=view}</span>
         </div>
     {/if}
     <hr />
@@ -134,21 +137,19 @@
             {str tag="yoursubmissions" section="view"}:
         {/if}
     </h4>
-    <ul id="groupviewlist" class="list-group list-unstyled list-group-unbordered">
+    <ul id="groupviewlist" class="list-group grouppages">
         {if $mysubmitted}
             {foreach from=$mysubmitted item=item}
-                <li class="list-group-item text-midtone {if $item.submittedstatus != '2'}pbm{/if}">
-                    <span>
-                        {if $item.submittedtime}
-                            {str tag=youhavesubmittedon section=view arg1=$item.url arg2=$item.name arg3=$item.submittedtime|format_date}
-                        {else}
-                            {str tag=youhavesubmitted section=view arg1=$item.url arg2=$item.name}
-                        {/if}
-                        {* submittedstatus == '2' is equivalent to PENDING_RELEASE *}
-                        {if $item.submittedstatus == '2'}
-                        <small>{str tag=submittedpendingrelease section=view}</small>
-                        {/if}
-                    </span>
+                <li class="list-group-item">
+                    {if $item.submittedtime}
+                        <span>{str tag=youhavesubmittedon section=view arg1=$item.url arg2=$item.name arg3=$item.submittedtime|format_date}</span>
+                    {else}
+                        {str tag=youhavesubmitted section=view arg1=$item.url arg2=$item.name}
+                    {/if}
+                    {* submittedstatus == '2' is equivalent to PENDING_RELEASE *}
+                    {if $item.submittedstatus == '2'}
+                    <span class="text-small">{str tag=submittedpendingrelease section=view}</span>
+                    {/if}
                 </li>
             {/foreach}
         {/if}
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviewssection.tpl b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviewssection.tpl
index b8e478b21a..ea8be674b3 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviewssection.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/groupviewssection.tpl
@@ -1,25 +1,26 @@
 {foreach from=$items item=view}
-    <li class="list-group-item text-midtone">
+    <li class="list-group-item">
         <a href="{$view.fullurl}" class="outer-link">
             <span class="sr-only">{$view.title}</span>
         </a>
+        <h5 class="list-group-item-heading">{$view.title}</h5>
         {if $view.template}
-        <div class="">
+        <div class="grouppage-from">
             {$view.form|safe}
         </div>
         {/if}
-            {$view.title}
-            {if $view.description}
-                <small class="detail mts metadata">
-                    {$view.description|str_shorten_html:100:true|strip_tags|safe}
-                </small>
-                {/if}
 
-                {if $view.tags}
-                <small class="tags mts">
-                    <strong>{str tag=tags}:</strong>
-                    {list_tags owner=$view.owner tags=$view.tags}
-                </small>
-            {/if}
+        {if $view.description}
+            <div class="detail text-small">
+                {$view.description|str_shorten_html:100:true|strip_tags|safe}
+            </div>
+        {/if}
+
+        {if $view.tags}
+            <div class="tags text-small">
+                <strong>{str tag=tags}:</strong>
+                {list_tags owner=$view.owner tags=$view.tags}
+            </div>
+        {/if}
     </li>
 {/foreach}
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedcollections.tpl b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedcollections.tpl
index e54a0fe70d..2090e768f3 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedcollections.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedcollections.tpl
@@ -3,13 +3,10 @@
         <a href="{$collection.fullurl}" class="outer-link">
          <span class="sr-only">{$collection.name}</span>
         </a>
-
-        {$collection.name}
-
+        <h5 class="text-inline">{$collection.name}</h5>
         {if $collection.sharedby}
-        <span class="owner metadata inner-link">
+        <span class="owner inner-link text-small">
             {str tag=by section=view}
-
             {if $collection.group}
                 <a href="{group_homepage_url($collection.groupdata)}" class="text-success">{$collection.sharedby}</a>
             {elseif $collection.owner}
@@ -20,16 +17,16 @@
         </span>
         {/if}
         {if $collection.description}
-        <small class="detail mts">
+        <div class="detail text-small">
             {$collection.description|str_shorten_html:100:true|strip_tags|safe}
-        </small>
+        </div>
         {/if}
 
         {if $collection.tags}
-        <small class="">
+        <div class="text-small">
             <strong>{str tag=tags}:</strong>
             <span class="inner-link">{list_tags owner=$collection.owner tags=$collection.tags}</span>
-        </small>
+        </div>
          {/if}
 
     </li>
diff --git a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedviews.tpl b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedviews.tpl
index ebbfd20e2c..53032637d2 100644
--- a/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedviews.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/groupviews/templates/sharedviews.tpl
@@ -4,14 +4,13 @@
 *}
 {assign var='author_link_index' value=1}
 {foreach from=$items item=view}
-    <li class="list-group-item" text-midtone">
+    <li class="list-group-item">
         <a href="{$view.fullurl}" class="outer-link">
               <span class="sr-only">{$view.title}</span>
         </a>
-            {$view.title}
-
+        <h5 class="text-inline">{$view.title}</h5>
             {if $view.sharedby}
-                <span class="owner inner-link text-small"> -
+                <span class="owner inner-link text-small text-midtone">
                     {str tag=by section=view}
                      {if $view.group}
                         <a href="{group_homepage_url($view.groupdata)}" class="text-success text-small">
@@ -38,7 +37,7 @@
                     {/if}
                 </span>
 
-                <span class="postedon text-small">
+                <span class="postedon text-small text-midtone">
                 {if $view.mtime == $view.ctime}{str tag=Created}{else}{str tag=Updated}{/if}
                 {$view.mtime|strtotime|format_date: 'strftimedate'}
                 </span>
diff --git a/htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl b/htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl
index 2eeed140e5..1ac7b2c143 100644
--- a/htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/inbox/templates/inboxmr.tpl
@@ -31,9 +31,20 @@
                     <a href="{$WWWROOT}{$i->url}" class="text-small">
                         {if $i->urltext}{$i->urltext}{else}{str tag="more..."}{/if} <span class="icon icon-arrow-right mls icon-sm"></span>
                     </a>
-                {/if}
+                    {/if}
+                    {if $i->canreplyall}
+                    <a title="{str tag=replyall section=module.multirecipientnotification}" href="{$WWWROOT}module/multirecipientnotification/sendmessage.php?replyto={$i->id}&returnto=outbox" class="text-small">
+                        <span class="icon icon-reply-all icon-sm left"></span>
+                        {str tag='replyall'  section='module.multirecipientnotification'}
+                    </a>
+                    {elseif $i->canreply}
+                        <a title="{str tag=reply section=module.multirecipientnotification}" href="{$WWWROOT}module/multirecipientnotification/sendmessage.php?id={$i->fromusr}{if !$i->startnewthread}&replyto={$i->id}{/if}&returnto=outbox" class="text-small">
+                            <span class="icon icon icon-reply left icon-sm"></span>
+                            {str tag='reply' section='module.multirecipientnotification'}
+                        </a>
+                    {/if}
                 {elseif $i->url}
-                    <a href="{$WWWROOT}{$i->url}">{$i->subject}</a>
+                    <a href="{$WWWROOT}{$i->url}" class="text-small">{$i->subject}</a>
                 {else}
                     {$i->subject}
                 {/if}
diff --git a/htdocs/theme/raw/plugintype/blocktype/mygroups/templates/mygroupslist.tpl b/htdocs/theme/raw/plugintype/blocktype/mygroups/templates/mygroupslist.tpl
index 96dfabb460..1be2ee1322 100644
--- a/htdocs/theme/raw/plugintype/blocktype/mygroups/templates/mygroupslist.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/mygroups/templates/mygroupslist.tpl
@@ -1,13 +1,10 @@
-
 <div class="list-group">
     {foreach from=$items item=item}
     <div class="list-group-item list-group-item-link">
-        <a href="{group_homepage_url($item)}">{$item->name} <span class="metadata"> - {$item->roledisplay}</span></a>
-        {if $item->description}
-            <div class="details text-small mtm">
-            {$item->description|str_shorten_html:100:true:true:false|safe}
-            </div>
-        {/if}
+        <a href="{group_homepage_url($item)}">
+            <h5 class="text-inline list-group-item-heading">{$item->name}</h5> 
+            <span class="text-small text-midtone"> ({$item->roledisplay})</span>
+        </a>
     </div>
     {/foreach}
 </div>
\ No newline at end of file
diff --git a/htdocs/theme/raw/plugintype/blocktype/myviews/templates/myviewspaginator.tpl b/htdocs/theme/raw/plugintype/blocktype/myviews/templates/myviewspaginator.tpl
index a76ed9f164..b73cb71d67 100644
--- a/htdocs/theme/raw/plugintype/blocktype/myviews/templates/myviewspaginator.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/myviews/templates/myviewspaginator.tpl
@@ -1,8 +1,11 @@
 {foreach from=$items item=view}
     <div class="{cycle values='r0,r1'} list-group-item">
-    <h4 class="title list-group-item-heading"><a href="{$view.fullurl}">{$view.title}</a>{if $view.collid} ({str tag=nviews section=view arg1=$view.numpages}){/if}</h4>
+    <h4 class="title list-group-item-heading text-inline">
+        <a href="{$view.fullurl}">{$view.title}</a>
+    </h4>
+    {if $view.collid} <span class="text-small text-midtone"> ({str tag=nviews section=view arg1=$view.numpages})</span>{/if}
     {if $view.description}
-        <div class="detail list-group-item-text text-small text-lighttone">{$view.description|str_shorten_html:100:true|strip_tags|safe}</div>
+        <div class="detail list-group-item-text text-small">{$view.description|str_shorten_html:100:true|strip_tags|safe}</div>
     {/if}
     {if $item.tags}
         <div class="tags"><span class="lead text-small">{str tag=tags}:</span> {list_tags owner=$view.owner tags=$view.tags}</div>
diff --git a/htdocs/theme/raw/plugintype/blocktype/navigation/templates/navigation.tpl b/htdocs/theme/raw/plugintype/blocktype/navigation/templates/navigation.tpl
index d0d824a836..7951e36e4d 100644
--- a/htdocs/theme/raw/plugintype/blocktype/navigation/templates/navigation.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/navigation/templates/navigation.tpl
@@ -1,15 +1,17 @@
 {if $views}
-    <ul id="collection-nav" class="list-group">
+    <div id="collection-nav" class="list-group">
         {foreach from=$views item=item name=view}
-            <li class=" list-group-item list-group-link{cycle name=rows values='r0,r1'}">
-                {if $currentview == $item->view}
-                    {$item->title}
-                {else}
-                   <a href="{$item->fullurl}">{$item->title}</a>
-                {/if}
-            </li>
+            <div class=" list-group-item {cycle name=rows values='r0,r1'}">
+                <h4 class="list-group-item-heading mb0">
+                    {if $currentview == $item->view}
+                        {$item->title}
+                    {else}
+                       <a href="{$item->fullurl}">{$item->title}</a>
+                    {/if}
+                </h4>
+            </div>
         {/foreach}
-    </ul>
+    </div>
 {else}
 <div class="panel-body">
     <p class="lead text-small">{str tag='noviewstosee' section='group'}</p>
diff --git a/htdocs/theme/raw/plugintype/blocktype/newviews/templates/newviews.tpl b/htdocs/theme/raw/plugintype/blocktype/newviews/templates/newviews.tpl
index 5bc953ba1c..a7409c293a 100644
--- a/htdocs/theme/raw/plugintype/blocktype/newviews/templates/newviews.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/newviews/templates/newviews.tpl
@@ -5,20 +5,13 @@
     state is non-persistent. So until Dwoo gets smarter...
     *}
     {assign var='author_link_index' value=1}
-    
+
     {foreach from=$views item=view}
     <div class="list-group-item">
-        <h4 class="list-group-item-heading">
+        <h4 class="list-group-item-heading text-inline">
             <a href="{$view.fullurl}">{$view.title}</a>
-            {if $view.collid}({str tag=nviews section=view arg1=$view.numpages}){/if}
         </h4>
-        
-        {if $view.description}
-        <p>
-            {$view.description|str_shorten_html:100:true|strip_tags|safe}
-        </p>
-        {/if}
-        
+        <span class="text-small text-midtone">{if $view.collid}({str tag=nviews section=view arg1=$view.numpages}){/if}</span>
         {if $view.sharedby}
         <div class="groupuserdate text-small">
             {if $view.group && $loggedin}
@@ -31,11 +24,11 @@
                     {assign var='realauthor' value=$view.sharedby}
                     {assign var='realauthorlink' value=profile_url($view.user)}
                 {/if}
-                
+
                 {assign var='author' value=get_string('anonymoususer')}
-                
+
                 {include file=author.tpl}
-                
+
                 {if $view.staff_or_admin}
                     {assign var='author_link_index' value=`$author_link_index+1`}
                 {/if}
@@ -47,7 +40,7 @@
         {else}
             {$view.sharedby}
         {/if}
-            <span class="postedon  text-muted">
+            <span class="postedon text-midtone">
                 - {if $view.mtime == $view.ctime}
                     {str tag=Created}
                 {else}
@@ -56,6 +49,11 @@
                 {$view.mtime|strtotime|format_date:'strftimedate'}
             </span>
         </div>
+        {if $view.description}
+        <p class="detail list-group-item-text text-small">
+            {$view.description|str_shorten_html:100:true|strip_tags|safe}
+        </p>
+        {/if}
     </div>
     {/foreach}
 </div>
diff --git a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/latestforumposts.tpl b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/latestforumposts.tpl
index 1746638a4f..3d804aeb90 100644
--- a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/latestforumposts.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/latestforumposts.tpl
@@ -7,8 +7,8 @@
                         <img src="{profile_icon_url user=$postinfo->author maxheight=60 maxwidth=60}" alt="{str tag=profileimagetext arg1=$postinfo->author|display_default_name}" />
                     </a>
 
-                    <h4 class="title list-group-item-heading mts mlxl">
-                         <a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic|escape}&post={$postinfo->id}" class="plm">
+                    <h4 class="title list-group-item-heading">
+                         <a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic|escape}&post={$postinfo->id}">
                             {$postinfo->topicname}
                             <span class="metadata">
                                 {$postinfo->author|display_name}
@@ -23,13 +23,13 @@
                 </li>
             {/foreach}
         </ul>
-        <a href="{$WWWROOT}interaction/forum/index.php?group={$group->id}" class="panel-footer">
+        <a href="{$WWWROOT}interaction/forum/index.php?group={$group->id}" class="panel-footer text-small">
         {str tag=gotoforums section=interaction.forum}
         <span class="icon icon-arrow-circle-right mls"></span>
         </a>
     </div>
 {else}
     <div class="panel-body">
-        {str tag=noforumpostsyet section=interaction.forum}
+        <span class="text-small no-results">{str tag=noforumpostsyet section=interaction.forum}</span>
     </div>
 {/if}
diff --git a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
index 60ef95d5ce..de6a171813 100644
--- a/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/recentforumposts/templates/recentforumposts.tpl
@@ -4,13 +4,12 @@
             {foreach from=$foruminfo item=postinfo}
             <li class="list-group-item {cycle values='r0,r1'} pl0">
 
-
                     <a href="{profile_url($postinfo->author)}" class="mts user-icon small-icon left">
                         <img src="{profile_icon_url user=$postinfo->author maxheight=40 maxwidth=40}" alt="{str tag=profileimagetext arg1=$postinfo->author|display_default_name}" class="pull-left">
                     </a>
 
-                    <h4 class="title list-group-item-heading mts mlxl">
-                        <a class="plm" href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}">
+                    <h4 class="title list-group-item-heading">
+                        <a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}&post={$postinfo->id}">
                             {$postinfo->topicname}
                             <span class="metadata text-small">
                                 - {$postinfo->author|display_name}</span>
@@ -25,7 +24,7 @@
         <ul>
     {else}
     <div class="panel-body">
-        <p class="lead text-small">
+        <p class="no-results text-small">
             {str tag=noforumpostsyet section=interaction.forum}
         </p>
     </div>
@@ -33,7 +32,7 @@
 
 
 </div>
-<a class="morelink panel-footer" href="{$WWWROOT}interaction/forum/index.php?group={$group->id}">
+<a class="morelink panel-footer text-small" href="{$WWWROOT}interaction/forum/index.php?group={$group->id}">
     {str tag=gotoforums section=interaction.forum}
     <span class="icon icon-arrow-circle-right mls  pull-right"></span>
 </a>
diff --git a/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl b/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
index f3da58926d..68ca1a8c0c 100644
--- a/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
+++ b/htdocs/theme/raw/plugintype/blocktype/wall/templates/inlineposts.tpl
@@ -10,7 +10,7 @@
                         <span class="user-icon small-icon left">
                             <img src="{profile_icon_url user=$wallpost maxheight=60 maxwidth=60}" alt="{str tag=profileimagetext arg1=$wallpost|display_default_name}" />
                         </span>
-                            {$wallpost->displayname} - <span class="postedon metadata">{$wallpost->postdate|format_date}</span>
+                            {$wallpost->displayname}<span class="postedon text-small text-midtone"> - {$wallpost->postdate|format_date}</span>
                     </a>
                 {if $wallpost->deletable}
                     <a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="panel-control panel-header-action">
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
index eb990b2639..16000bd145 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/index.tpl
@@ -13,7 +13,7 @@
     <div class="col-md-12 mtxl">
         {if $forums}
         <div id="view-forum" class="table-responsive">
-            <table id="forums-list" class="table fullwidth table-striped table-padded">
+            <table id="forums-list" class="table fullwidth table-padded">
                 <thead>
                     <tr>
                         <th>
@@ -55,10 +55,10 @@
                         </div>
 
                         {if $forum->moderators}
-                        <div class="list-inline">
-                            <span>
+                        <div class="text-small">
+                            <strong>
                                 {str tag="Moderators" section="interaction.forum"}:
-                            </span>
+                            </strong>
 
                             {foreach from=$forum->moderators item=mod}
                             <a href="{profile_url($mod)}">
@@ -107,10 +107,9 @@
         </div>
         {/if}
         <div class="forummods">
-            <p class="lead text-small">
+            <p class="text-small text-inline">
                 {str tag="groupadminlist" section="interaction.forum"}
             </p>
-
             {foreach from=$groupadmins item=groupadmin}
                 <a href="{profile_url($groupadmin)}" class="label label-default">
                     <img src="{profile_icon_url user=$groupadmin maxheight=20 maxwidth=20}" alt="{str tag=profileimagetext arg1=$groupadmin|display_default_name}" class="user-icon-alt"> {$groupadmin|display_name}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
index cac438d252..d35b7768b1 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/post.tpl
@@ -1,33 +1,24 @@
 {if $post->deleted}
 <h5 class="deletedpost">
     {if $post->deletedcount > 1}
-    
-    {str tag="postsbyuserweredeleted" section="interaction.forum" args=array($post->deletedcount,display_name($post->poster))}
-    
+        {str tag="postsbyuserweredeleted" section="interaction.forum" args=array($post->deletedcount,display_name($post->poster))}
     {else}
-    
-    {str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}
-    
+        {str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}
     {/if}
 </h5>
 
 {else}
 <div class="pbm ptm" style="margin-left:auto; margin-right:0px; width:{$width}%">
     {if $post->parent}
-    
-    {include file="interaction:forum:simplepost.tpl" post=$post groupadmins=$groupadmins highlightreported=$highlightreported}
-    
+        {include file="interaction:forum:simplepost.tpl" post=$post groupadmins=$groupadmins highlightreported=$highlightreported}
     {else}
-    
-    {include file="interaction:forum:simplepost.tpl" post=$post groupadmins=$groupadmins highlightreported=$highlightreported nosubject=true}
-    
+        {include file="interaction:forum:simplepost.tpl" post=$post groupadmins=$groupadmins highlightreported=$highlightreported nosubject=true}
     {/if}
-    
+
     {if $reportedaction}
     <div class="reportedaction alert alert-danger mtl">
         {$post->postnotobjectionableform|safe}
     </div>
-    
     {elseif $highlightreported}
     <div class="reportedaction text-danger ptm">
         {str tag=postobjectionable section=interaction.forum}
@@ -42,26 +33,25 @@
                 {str tag="Reply" section=interaction.forum}
             </a>
             {/if}
-        
         {/if}
-        
+
         {if $post->canedit}
         <a href="{$WWWROOT}interaction/forum/editpost.php?id={$post->id}" class="mll">
             <span class="icon icon-pencil"></span>
             {str tag="edit"}
         </a>
         {/if}
-        
-        {if $moderator && $post->parent} 
+
+        {if $moderator && $post->parent}
         <a href="{$WWWROOT}interaction/forum/deletepost.php?id={$post->id}" class="mll">
-            <span class="icon icon-trash"></span>
+            <span class="icon icon-trash text-danger"></span>
             {str tag="delete"}
         </a>
         {/if}
-        
+
         {if $LOGGEDIN && !$post->ownpost && !$highlightreported}
         <a href="{$WWWROOT}interaction/forum/reportpost.php?id={$post->id}" class="mll">
-            <span class="icon icon-exclamation-triangle"></span>
+            <span class="icon icon-flag text-danger"></span>
             {str tag=reportobjectionablematerial section=interaction.forum}
         </a>
         {/if}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl
index 453f7197ff..a2fd4876c2 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/simplepost.tpl
@@ -4,16 +4,16 @@
 {/if}
 
     <div class="media forum-post">
-        <div class="forumpostleft media-left metadata">
+        <div class="forumpostleft media-left text-small">
             <img src="{profile_icon_url user=$post->poster maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$post->poster|display_default_name}" class="media-object">
-            
+
             <div class="poster mtm">
                 <a href="{profile_url($post->poster)}"{if in_array($post->poster, $groupadmins)} class="groupadmin"{elseif $post->moderator} class="moderator"{/if}>{$post->poster|display_name}
                 </a>
             </div>
-            
+
             {if $post->postcount}
-            <div class="postcount mtm">
+            <div class="postcount text-lighttone">
                 {$post->postcount}
             </div>
             {/if}
@@ -21,7 +21,7 @@
         <div class="postedits media-body">
             {if $post->subject && !$nosubject}
             <div class="forumsubject media-heading">
-                <h4 class="title">
+                <h5 class="title">
                     {if $post->id}
                     <a href="#post{$post->id}">
                         {$post->subject}
@@ -29,16 +29,16 @@
                     {else}
                         {$post->subject}
                     {/if}
-                </h4>
+                </h5>
             </div>
             {/if}
-            
-            <p class="posttime detail">
+
+            <p class="posttime detail text-small text-lighttone">
                 {$post->ctime}
             </p>
-            
+
             {$post->body|clean_html|safe}
-            
+
             {if $post->edit}
             <div class="editstopost mtl">
                 <h5 class="title">
@@ -54,7 +54,7 @@
                         >
                         <img src="{profile_icon_url user=$edit.editor maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$edit.editor|display_default_name}">
                         {$edit.editor|display_name}
-                    </a> - 
+                    </a> -
                     <span class="posttime text-muted">
                         {$edit.edittime}
                     </span>
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
index c0d25c470e..8c7c80195d 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/topic.tpl
@@ -29,7 +29,7 @@
     <br />
     {$topic->subject}
 </h2>
-<hr class="mbxl" />
+<hr>
 
 {if $topic->closed}
 <div class=" closed">
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
index 388b792b13..17e17d2311 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/topics.tpl
@@ -1,54 +1,60 @@
 {foreach from=$topics item=topic}
-{$objectionableclass = ''}
+{cycle assign='objectionableclass' values='r0,r1'}
 {if $topic->containsobjectionable}
-{$objectionableclass = 'containobjectionable'}
+{$objectionableclass .= ' containobjectionable'}
 {/if}
 
 {if $sticky}
 <tr class="stickytopic {$objectionableclass}">
 {else}
 <tr class="{$objectionableclass}">
-    {/if}
+{/if}
     <td class="narrow">
         {if $membership && (!$forum->subscribed || $moderator)}
         <input type="checkbox" name="checked[{$topic->id}]" id="topic_{$topic->id}" class="topic-checkbox mtl">
         {/if}
     </td>
     <td class="topic">
-        <div class="text-inline">
-            {if $topic->closed}
-            <span class="icon icon-lock icon-lg prs"></span>
-            <span class="sr-only">{str tag="Closed" section="interaction.forum"}</span>
+        <h3 class="title text-inline">
+            {if $membership && (!$forum->subscribed || $moderator)}
+            <label for="topic_{$topic->id}">
             {/if}
+            {if $topic->closed || $topic->subscribed || $sticky}
+                {if $sticky}
+                <span class="icon icon-asterisk icon-sm left text-lighttone"></span>
+                {/if}
 
-            {if $topic->subscribed}
-            <span class="icon icon-star icon-lg prs"></span>
-            <span class="sr-only">{str tag="Subscribed" section="interaction.forum"}</span>
+                {if $topic->closed}
+                <span class="icon icon-lock icon-sm left"></span>
+                <span class="sr-only">{str tag="Closed" section="interaction.forum"}</span>
+                {/if}
+
+                {if $topic->subscribed}
+                <span class="icon icon-star icon-sm left"></span>
+                <span class="sr-only">{str tag="Subscribed" section="interaction.forum"}</span>
+                {/if}
             {/if}
-        </div>
-        <h3 class="title text-inline">
-            {if $membership && (!$forum->subscribed || $moderator)}<label for="topic_{$topic->id}">{/if}
             <a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">
                 {$topic->subject}
             </a>
-            {if $membership && (!$forum->subscribed || $moderator)}</label>{/if}
-            <span class="metadata text-small">
+            {if $membership && (!$forum->subscribed || $moderator)}
+            </label>
+            {/if}
+            <span class="text-small text-midtone">
                 {str tag=by section=view}
                 <a href="{profile_url($topic->poster)}" class="forumuser{if in_array($topic->poster, $groupadmins)} groupadmin{elseif $topic->moderator} moderator{/if}">
                     {$topic->poster|display_name:null:true}
                 </a>
             </span>
         </h3>
-        <div class="text-small threaddetails mtm">
-
-
+        <div class="threaddetails mts">
             <p>{$topic->body|str_shorten_html:50:true:false|safe}</p>
         </div>
     </td>
     <td class="postscount text-center">
         {$topic->postcount}
     </td>
-    <td class="lastposttd metadata">
+    <td class="lastposttd text-small">
             {if !$topic->lastpostdeleted}
             <a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}&post{$topic->lastpost}">
                 {$topic->lastposttime}
@@ -66,8 +72,8 @@
         </p>
 
     </td>
-    <td class="control-buttons">
     {if $moderator}
+    <td class="control-buttons">
         <div class="btn-group">
             <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="edit"}">
                 <span class="icon icon-pencil icon-lg"></span>
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
index b8eebba5a8..98934f265d 100644
--- a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
+++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl
@@ -42,14 +42,14 @@
 <hr class="mbl" />
 
 
-<div id="forum-description" class="lead pbl">
+<div id="forum-description" class="lead">
     {$forum->description|clean_html|safe}
 </div>
 
 <div id="viewforum">
     {if $stickytopics || $regulartopics}
-    <form action="" method="post" class="mtxl">
-        <table id="forumtopicstable" class="table fullwidth table-striped table-padded">
+    <form action="" method="post" class="form-inline">
+        <table id="forumtopicstable" class="table fullwidth table-padded">
             <thead>
                 <tr>
                     <th class="narrow"></th>
@@ -76,8 +76,8 @@
         {/if}
 
         {if $membership && (!$forum->subscribed || $moderator)}
-        <div class="forumselectwrap form-inline ptl">
-            <select name="type" id="action">
+        <div class="forumselectwrap input-group">
+            <select name="type" id="action" class="form-control select">
                 <option value="default" selected="selected">
                     {str tag="chooseanaction" section="interaction.forum"}
                 </option>
@@ -108,7 +108,7 @@
                 <option value="open">
                     {str tag="Open" section="interaction.forum"}
                 </option>
-            {/if}
+                {/if}
 
             {if $moderator && $otherforums && (count($otherforums) > 0)}
                 <option value="moveto">
@@ -118,7 +118,7 @@
             </select>
 
             {if $moderator && $otherforums && (count($otherforums) > 0)}
-            <select name="newforum" id="otherforums" class="hidden">
+            <select name="newforum" id="otherforums" class="hidden select form-control">
                 {foreach from=$otherforums item=otherforum}
                 <option value="{$otherforum->id}">
                     {$otherforum->title}
@@ -126,46 +126,47 @@
                 {/foreach}
             </select>
             {/if}
-
-            <button type="submit" name="updatetopics" class="btn btn-primary">
-                {str tag="updateselectedtopics" section="interaction.forum"}
-            </button>
-            {if $moderator}
-            {contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
-
-            {else}
-
-            {contextualhelp plugintype='interaction' pluginname='forum' section='update'}
-            {/if}
+            <span class="input-group-btn">
+                <button type="submit" name="updatetopics" class="btn btn-primary">
+                    {str tag="updateselectedtopics" section="interaction.forum"}
+                </button>
+            </span>
         </div>
         {/if}
         <input type="hidden" name="sesskey" value="{$SESSKEY}">
+        {if $moderator}
+        {contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
+        {else}
+        {contextualhelp plugintype='interaction' pluginname='forum' section='update'}
+        {/if}
     </form>
 </div>
 
 <div class="forumfooter ptl pbl">
-    <p class="lead text-small">
-        {str tag="groupadminlist" section="interaction.forum"}
-    </p>
-
-    {foreach from=$groupadmins item=groupadmin}
-        <a href="{profile_url($groupadmin)}" class="label label-default">
-            <img src="{profile_icon_url user=$groupadmin maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$groupadmin|display_default_name}" class="user-icon-alt">
-            {$groupadmin|display_name}
-        </a>
-    {/foreach}
-
-    {if $moderators}
-        <p class="lead text-small">
-            {str tag="moderatorslist" section="interaction.forum"}
+    <div class="adminlist">
+        <p class="text-small text-inline">
+            {str tag="groupadminlist" section="interaction.forum"}
         </p>
-
-        {foreach from=$moderators item=mod}
-            <a href="{profile_url($mod)}" class="label label-default">
-                <img src="{profile_icon_url user=$mod maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$mod|display_default_name}" class="user-icon-alt">
-                {$mod|display_name}
+        {foreach from=$groupadmins item=groupadmin}
+            <a href="{profile_url($groupadmin)}" class="label label-default">
+                <img src="{profile_icon_url user=$groupadmin maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$groupadmin|display_default_name}" class="user-icon-alt">
+                {$groupadmin|display_name}
             </a>
         {/foreach}
+    </div>
+    {if $moderators}
+        <div class="moderatorlist ptm">
+            <p class="text-small text-inline">
+                {str tag="moderatorslist" section="interaction.forum"}
+            </p>
+
+            {foreach from=$moderators item=mod}
+                <a href="{profile_url($mod)}" class="label label-default">
+                    <img src="{profile_icon_url user=$mod maxwidth=20 maxheight=20}" alt="{str tag=profileimagetext arg1=$mod|display_default_name}" class="user-icon-alt">
+                    {$mod|display_name}
+                </a>
+            {/foreach}
+        </div>
     {/if}
 </div>
 
diff --git a/htdocs/theme/raw/sass/_custom.scss b/htdocs/theme/raw/sass/_custom.scss
index 73b3ab3e5f..af34fb13ef 100644
--- a/htdocs/theme/raw/sass/_custom.scss
+++ b/htdocs/theme/raw/sass/_custom.scss
@@ -37,11 +37,19 @@
     position: fixed;
     top: 70px;
     z-index: 1;
+    @media (max-width: $screen-sm-min) {
+        top: 0;
+    }
 }
 
 .layoutthumb {
-    rect {
-        fill: #f2f2f2;
+    rect.layout1 {
+        fill: darken($panel-default-heading-bg, 10%);
+        stroke: #ccc;
+    }
+
+    rect.layout0 {
+        fill: darken($panel-default-heading-bg, 15%);
         stroke: #ccc;
     }
 
diff --git a/htdocs/theme/raw/sass/_shame.scss b/htdocs/theme/raw/sass/_shame.scss
index facdafb609..b705e4d2ec 100644
--- a/htdocs/theme/raw/sass/_shame.scss
+++ b/htdocs/theme/raw/sass/_shame.scss
@@ -36,4 +36,3 @@
         }
     }
 }
-
diff --git a/htdocs/theme/raw/sass/components/_arrow-bar.scss b/htdocs/theme/raw/sass/components/_arrow-bar.scss
index e72ffb7845..eaef4def9c 100644
--- a/htdocs/theme/raw/sass/components/_arrow-bar.scss
+++ b/htdocs/theme/raw/sass/components/_arrow-bar.scss
@@ -36,9 +36,9 @@
         position: relative;
         display: block;
         background-color: $arrow-color;
-        width: 23%;
+        width: auto;
         @media (max-width: $screen-md-min) {
-            width: 20%;
+            width: auto;
         }
         &:after {
             border-bottom: 29px solid transparent;
diff --git a/htdocs/theme/raw/sass/components/_artefactchooser.scss b/htdocs/theme/raw/sass/components/_artefactchooser.scss
new file mode 100644
index 0000000000..d95134bc52
--- /dev/null
+++ b/htdocs/theme/raw/sass/components/_artefactchooser.scss
@@ -0,0 +1,12 @@
+.artefactchooser-item {
+    input {
+        display: inline-block;
+    }
+    label {
+        min-width: auto;
+        display: inline-block;
+    }
+    .detail {
+        margin-left: 17px;
+    }
+}
\ No newline at end of file
diff --git a/htdocs/theme/raw/sass/components/_btn-group.scss b/htdocs/theme/raw/sass/components/_btn-group.scss
index dddbec77d5..cf7b37bc3d 100644
--- a/htdocs/theme/raw/sass/components/_btn-group.scss
+++ b/htdocs/theme/raw/sass/components/_btn-group.scss
@@ -3,37 +3,39 @@
 // --------------------------------------------------
 
 .btn-group .form-as-button:first-child:not(.last) {
-  .btn {
-     @include border-right-radius(0);
-     border-right:0;
-  }
+    .btn {
+         @include border-right-radius(0);
+         border-right:0;
+    }
 }
 
 .btn-group .form-as-button ~ .form-as-button {
-  .btn {
-      @include border-left-radius(0);
-  }
+    .btn {
+            @include border-left-radius(0);
+    }
 }
 
 // Custom for comment list
 .form-as-button.delete-comment {
-    display: inline-block;
-    margin-top: -1px;
-    margin-left: -1px;
-    @include border-right-radius(0);
-    + .btn {
+        display: inline-block;
+        margin-top: -1px;
         margin-left: -1px;
-    }
+        @include border-right-radius(0);
+        + .btn {
+                margin-left: -1px;
+        }
 }
 
 .btn-group .form-as-button div.last {
-  display: inline-block;
-  margin: 0;
-  padding: 0;
-  .btn {
-    border-left:0;
     display: inline-block;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-  }
+    margin: 0;
+    padding: 0;
+    .btn {
+        border-left:0;
+        display: inline-block;
+        border-bottom-left-radius: 0;
+        border-top-left-radius: 0;
+    }
 }
+
+
diff --git a/htdocs/theme/raw/sass/components/_btn.scss b/htdocs/theme/raw/sass/components/_btn.scss
index fd6413f96b..ff825d9206 100644
--- a/htdocs/theme/raw/sass/components/_btn.scss
+++ b/htdocs/theme/raw/sass/components/_btn.scss
@@ -149,6 +149,7 @@ td.btn-group {
         }
         .btn {
             @extend .btn-sm;
+            padding-top: 3px;
         }
         // this means that in the 'smaller view' we hide the element with this class
         // cf buttons in list group
diff --git a/htdocs/theme/raw/sass/components/_indicator.scss b/htdocs/theme/raw/sass/components/_indicator.scss
index 7b930528c0..daf93c6191 100644
--- a/htdocs/theme/raw/sass/components/_indicator.scss
+++ b/htdocs/theme/raw/sass/components/_indicator.scss
@@ -3,7 +3,7 @@
     @extend .text-muted;
     font-size: 9px;
     vertical-align: middle;
-    margin-left: -7px;
+    margin-left: -4px;
     opacity: 0.7;
 
     a:hover &,
@@ -42,14 +42,8 @@
         margin-top: 5px;
     }
 }
-//dash inner
-//messages: inbox, sent
-//admin: site options
-//journals
-.inboxblock .link-block,
-.form-notificationlist h4 a,
-.pieform-fieldset.collapsible h4 a,
-.myblogs h5 a {
+
+a[data-toggle="collapse"] {
     &:hover .collapse-indicator,
     &:focus .collapse-indicator{
         color: #555;
@@ -80,8 +74,6 @@
     }
 }
 
-
-
 // syntax change if link is an outer-link
 [data-toggle="collapse"].outer-link {
     &.collapsed {
diff --git a/htdocs/theme/raw/sass/components/_list-group.scss b/htdocs/theme/raw/sass/components/_list-group.scss
index 906c8b1ae7..5c55797976 100644
--- a/htdocs/theme/raw/sass/components/_list-group.scss
+++ b/htdocs/theme/raw/sass/components/_list-group.scss
@@ -135,6 +135,9 @@ h4.list-group-item-heading {
     background-color: rgba($brand-default, 0.5);
 }
 
+.list-group-item-text {
+    margin-top: 5px;
+}
 
 // Modifiy for list-groups in panels
 .panel > .block {
@@ -152,7 +155,20 @@ h4.list-group-item-heading {
             border-bottom-left-radius: 3px;
         }
     }
+}
 
+.grouppages .list-group-item {
+    h5 {
+        font-size: $font-size-base;
+        margin-top: 0;
+        margin-bottom: 0;
+    }
+    .detail {
+        padding-top: 8px;
+    }
+    + .pagination-container {
+        padding-top: 10px;
+    }
 }
 
 .panel-heading + .block > .list-group .list-group-item:first-child {
diff --git a/htdocs/theme/raw/sass/components/_modal.scss b/htdocs/theme/raw/sass/components/_modal.scss
index 4ab3a51fdc..34c1ec4448 100644
--- a/htdocs/theme/raw/sass/components/_modal.scss
+++ b/htdocs/theme/raw/sass/components/_modal.scss
@@ -148,7 +148,7 @@ $width-sm: 90%;
             opacity: 1;
             position: absolute;
             top: 1px;
-            left: -30px;
+            left: -29px;
             padding: 10px 7px 9px;
             background: #fff;
             border: 1px solid $modal-header-border-color;
diff --git a/htdocs/theme/raw/sass/components/_pagination.scss b/htdocs/theme/raw/sass/components/_pagination.scss
index 8435122c3f..7a292fefd0 100644
--- a/htdocs/theme/raw/sass/components/_pagination.scss
+++ b/htdocs/theme/raw/sass/components/_pagination.scss
@@ -1,8 +1,11 @@
 .pagination-wrapper {
     @extend .clearfix;
+    .lead {
+        margin-bottom: 0;
+    }
     .pagination {
-        margin: 0 0 10px 0;
-        padding-left: 0;
+        margin: 0;
+        padding-left: 0 !important;
         @media (max-width: $screen-sm-min) {
             padding-top: 10px;
             .hidden-xs {
@@ -15,6 +18,7 @@
     }
     .form-pagination {
         font-size: $font-size-small;
+        margin-top: 10px;
         label {
             min-width: inherit;
         }
diff --git a/htdocs/theme/raw/sass/components/_user-icon.scss b/htdocs/theme/raw/sass/components/_user-icon.scss
index 4f7b5d67aa..54202e6068 100644
--- a/htdocs/theme/raw/sass/components/_user-icon.scss
+++ b/htdocs/theme/raw/sass/components/_user-icon.scss
@@ -60,6 +60,14 @@
         margin-top: 3px;
         margin-bottom: 0;
     }
+
+    // Style for blocktype forum post
+    .forumposts & {
+        margin-top: 10px;
+    }
+    +.list-group-item-heading {
+        padding-left: 45px;
+    }
 }
 
 .user-icon-alt {
@@ -74,7 +82,7 @@
 }
 
 .with-user-icon {
-    max-width:80%;
+    padding-left: 53px;
 }
 
 .panel-heading {
@@ -83,6 +91,12 @@
     }
 }
 
+.panel-body {
+    .with-user-icon-lg {
+        padding-right: 67px;
+    }
+}
+
 a.user-icon, a .user-icon {
     &:hover,
     &:focus {
diff --git a/htdocs/theme/raw/sass/form/_form-group.scss b/htdocs/theme/raw/sass/form/_form-group.scss
index c8c2238e2f..9823bb9cab 100644
--- a/htdocs/theme/raw/sass/form/_form-group.scss
+++ b/htdocs/theme/raw/sass/form/_form-group.scss
@@ -39,6 +39,12 @@
         }
     }
 
+    // Reset form-group for btn-group-top
+    &.group-request {
+        border-bottom: 0;
+        padding: 0;
+    }
+
     &.input-pair {
         padding-top: 10px;
         .select2 {
diff --git a/htdocs/theme/raw/sass/form/_form.scss b/htdocs/theme/raw/sass/form/_form.scss
index 4b6c82cc80..1ac96f95bc 100644
--- a/htdocs/theme/raw/sass/form/_form.scss
+++ b/htdocs/theme/raw/sass/form/_form.scss
@@ -18,7 +18,6 @@ select {
 label,
 .pseudolabel {
     @extend .control-label;
-    min-width: 265px;
     max-width: 100%;
     padding-right: 10px;
     font-weight: normal;
@@ -35,6 +34,9 @@ label,
         min-width: 0;
         width:0;
     }
+    .topic & {
+        font-weight: 300;
+    }
     .form-inline & {
         min-width: 0;
     }
@@ -47,6 +49,9 @@ label,
     .column &{
         min-width: 0;
     }
+    @media (min-width: $screen-sm-min) {
+        min-width: 265px;
+    }
 }
 
 .pseudolabel {
@@ -110,8 +115,11 @@ label,
 }
 
 .resizable-textarea {
-    .textarea:not(.in-modal) {
+    .textarea:not(.under-label) {
         @extend .align-with-input;
+            @media (min-width: $screen-sm-min) {
+                margin-top: -25px;
+        }
     }
 }
 
diff --git a/htdocs/theme/raw/sass/form/_site-messages.scss b/htdocs/theme/raw/sass/form/_site-messages.scss
index 2fccad2902..41059f1101 100755
--- a/htdocs/theme/raw/sass/form/_site-messages.scss
+++ b/htdocs/theme/raw/sass/form/_site-messages.scss
@@ -13,26 +13,25 @@
     }
 
     ~ .header {
-        top: 30px;    //for one message
+        top: 33px;    //for one message
         + .main-nav {
-            margin-top: 30px;    //for one message
+            margin-top: 32px;    //for one message
         }
     }
 }
 
 
 //adjust header and fixed elements for sitemessages
-
 @for $i from 1 through 5 {
     .header.message-count-#{$i} {
-        top: 30px * $i;
+        top: 33px * $i;
         + .main-nav {
-            margin-top: $i * 30px;
+            margin-top: $i * 32px;
         }
 
         ~ .container {
             .toolbar-affix.affix {
-                margin-top: $i * 30px;
+                margin-top: $i * 33px;
             }
         }
         @media (max-width: $screen-sm-min) {
diff --git a/htdocs/theme/raw/sass/layout/_columns.scss b/htdocs/theme/raw/sass/layout/_columns.scss
index 9058304d5b..7159815776 100644
--- a/htdocs/theme/raw/sass/layout/_columns.scss
+++ b/htdocs/theme/raw/sass/layout/_columns.scss
@@ -28,19 +28,27 @@ $columns: 8; //up to 8
 .column {
     -ms-word-break: break-all;
     word-break: break-all;
-    word-break:     break-word;
+    word-break: break-word;
     vertical-align: top;
     float: left;
     margin: 0;
     padding: 0 0.9% 10px 0.9%;
     max-width: 98%;
     position: relative;
-    &:first-child {max-width: 98%;
+    &:first-child {
+        max-width: 98%;
         padding-left:0;
     }
     &:last-child {
         padding-right:0;
     }
+
+    @media (max-width: $screen-sm-min) {
+        padding: 0 0 10px 0;
+        &:first-child {
+            max-width: 100%;
+        }
+    }
 }
 
 
@@ -70,4 +78,4 @@ $columns: 8; //up to 8
     @media (min-width: $screen-sm-min + 1) {
         margin-left: -2%;
     }
-}
+}
\ No newline at end of file
diff --git a/htdocs/theme/raw/sass/layout/_layout.scss b/htdocs/theme/raw/sass/layout/_layout.scss
index e1a51f6952..0bfaa8c982 100644
--- a/htdocs/theme/raw/sass/layout/_layout.scss
+++ b/htdocs/theme/raw/sass/layout/_layout.scss
@@ -59,8 +59,13 @@ body {
     clear:both;
 }
 
-.wallpost:first-child {
-    margin-top: 20px;
+.wallpost {
+    &:first-child {
+        margin-top: 20px;
+    }
+    p {
+        margin-bottom: 0;
+    }
 }
 
 .columns3,
@@ -79,7 +84,6 @@ body {
     clear: both;
 }
 
-
 // Needed to clear the float when dropzone is visible
 .blocktype {
   &.ui-draggable:before {
@@ -93,3 +97,13 @@ body {
     margin-bottom: 0;
   }
 }
+
+// Limit the width of external media
+// to fit the width of the column
+.mediaplayer-container iframe {
+    width: 100%;
+}
+
+.pagedescription {
+    padding-top: 30px;
+}
diff --git a/htdocs/theme/raw/sass/layout/panel/_panel-body.scss b/htdocs/theme/raw/sass/layout/panel/_panel-body.scss
index e2968cacb1..31c0c4ffdc 100644
--- a/htdocs/theme/raw/sass/layout/panel/_panel-body.scss
+++ b/htdocs/theme/raw/sass/layout/panel/_panel-body.scss
@@ -1,6 +1,6 @@
 // Display objects in panels differently
 .panel-body {
-    ul {
+    ul:not(.profile-info) {
         font-size: 0.9em;
         &:not(.list-unstyled):not(.unstyled):not(.select2-selection__rendered) {
             padding-left: 20px;
diff --git a/htdocs/theme/raw/sass/layout/panel/_panel-form.scss b/htdocs/theme/raw/sass/layout/panel/_panel-form.scss
index ab8179ffb1..10e24dfceb 100644
--- a/htdocs/theme/raw/sass/layout/panel/_panel-form.scss
+++ b/htdocs/theme/raw/sass/layout/panel/_panel-form.scss
@@ -1,5 +1,5 @@
 .panel-form {
-    background-color: $panel-default-heading-bg;
+    background-color: lighten($panel-default-heading-bg, 1%);
     border-bottom: 1px solid $panel-default-border;
     padding: 15px;
     margin-bottom:20px;
diff --git a/htdocs/theme/raw/sass/layout/panel/_panel-items.scss b/htdocs/theme/raw/sass/layout/panel/_panel-items.scss
index 1c18cd233e..574df98dd5 100644
--- a/htdocs/theme/raw/sass/layout/panel/_panel-items.scss
+++ b/htdocs/theme/raw/sass/layout/panel/_panel-items.scss
@@ -18,6 +18,10 @@
         }
         &.double {
             width: 30.3% * 2 + 3%; //double width panel
+            @media (max-width: $screen-xs-min) {
+                margin-top: 50px;
+                width: 100% - 3;
+            }
         }
         &.panel-half {
             width: 50 - 3%;
diff --git a/htdocs/theme/raw/sass/layout/panel/_panel.scss b/htdocs/theme/raw/sass/layout/panel/_panel.scss
index 8c45a0b81b..be67a36dff 100755
--- a/htdocs/theme/raw/sass/layout/panel/_panel.scss
+++ b/htdocs/theme/raw/sass/layout/panel/_panel.scss
@@ -9,11 +9,15 @@
     small {
         margin-top:5px;
         line-height: 1.5em;
-        font-size: 0.8em;
         color: $gray;
         display: block;
     }
 
+    .list-group-item small {
+        @extend .text-lighttone;
+        font-size: $font-size-base - 2;
+    }
+
     dl {
         dt {
             font-weight:normal;
diff --git a/htdocs/theme/raw/sass/lib/_draggable.scss b/htdocs/theme/raw/sass/lib/_draggable.scss
index 75ef5beba9..97213a75ef 100644
--- a/htdocs/theme/raw/sass/lib/_draggable.scss
+++ b/htdocs/theme/raw/sass/lib/_draggable.scss
@@ -8,6 +8,8 @@
 
 .btn-draggable .btn-group-vertical > .btn {
     @extend .icon;
+    font-family: $font-family-base;
+    font-size: $font-size-base;
     padding: 10px 12px 10px 35px;
     text-align: left;
 
@@ -32,6 +34,9 @@
         right: 10px;
         top: 10px;
     }
+    label {
+        font-size: $font-size-base;
+    }
 }
 .draggable {
     z-index: 1;
diff --git a/htdocs/theme/raw/sass/lib/_graph.scss b/htdocs/theme/raw/sass/lib/_graph.scss
index 06e2b67b8e..02b8fe6147 100644
--- a/htdocs/theme/raw/sass/lib/_graph.scss
+++ b/htdocs/theme/raw/sass/lib/_graph.scss
@@ -11,7 +11,7 @@
         position: relative;
         margin-bottom: 4px;
         border-radius: 3px;
-        padding: 2px 6px 2px 28px;
+        padding: 2px 17px 2px 25px;
         font-size: 0.9em;
         cursor: default;
         -webkit-transition: background-color 200ms ease-in-out;
diff --git a/htdocs/theme/raw/sass/lib/_tinymce.scss b/htdocs/theme/raw/sass/lib/_tinymce.scss
index 68ed6b19d4..80ee7f7dfa 100755
--- a/htdocs/theme/raw/sass/lib/_tinymce.scss
+++ b/htdocs/theme/raw/sass/lib/_tinymce.scss
@@ -18,12 +18,12 @@
 
     .mce-statusbar.mce-container{
         margin-top: 5px;
-        background: $panel-info-heading-bg;
+        background: $panel-default-heading-bg;
     }
 }
 
 .mce-fullscreen.mce-tinymce {
-  z-index: $zindex-tooltip + 10; // needs to be above all bootstrap components
+    z-index: $zindex-tooltip + 10; // needs to be above all bootstrap components
 }
 
 .modal-tinymce .hidden-xs {
diff --git a/htdocs/theme/raw/sass/typography/_tables.scss b/htdocs/theme/raw/sass/typography/_tables.scss
index b8aeef97de..1ff290d4e9 100644
--- a/htdocs/theme/raw/sass/typography/_tables.scss
+++ b/htdocs/theme/raw/sass/typography/_tables.scss
@@ -71,6 +71,10 @@ td.tiny {
     .narrow {
         width: 20px;
     }
+
+    small {
+        font-size: $font-size-base - 2;
+    }
 }
 
 .table-hover {
@@ -165,7 +169,7 @@ table.table tr {
 }
 
 .table-help-text {
-    @extend .text-watermark;
+    @extend .text-midtone;
     float: right;
     display: block;
     line-height: 30px;
diff --git a/htdocs/theme/raw/sass/typography/_typography.scss b/htdocs/theme/raw/sass/typography/_typography.scss
index e6a964cb08..19f5be15ad 100644
--- a/htdocs/theme/raw/sass/typography/_typography.scss
+++ b/htdocs/theme/raw/sass/typography/_typography.scss
@@ -34,7 +34,7 @@ h1 {
         @include border-bottom-radius(3px);
         margin-top: -20px;
         background-color: #f7f7f7;
-        padding: 10px;
+        padding: 20px 10px 10px 10px;
         border-bottom: 1px solid #eee;
         .admin & {
             background-color: #fcfcfc;
@@ -47,10 +47,6 @@ h1 {
             margin-top: -1px;
             max-width: 100%;
         }
-        //used to align form on profile page
-        &.with-user-icon {
-            padding-left: 92px;
-        }
         .form-group {
             .select2 {
                 max-width: 100%;
diff --git a/htdocs/theme/raw/sass/utilities/_index.scss b/htdocs/theme/raw/sass/utilities/_index.scss
index c2439163be..09e38232e9 100644
--- a/htdocs/theme/raw/sass/utilities/_index.scss
+++ b/htdocs/theme/raw/sass/utilities/_index.scss
@@ -53,6 +53,7 @@
 
 // Components - small reusable design elements
 @import "../components/arrow-bar";
+@import "../components/artefactchooser";
 @import "../components/btn";
 @import "../components/btn-group";
 @import "../components/carousel";
diff --git a/htdocs/theme/raw/templates/admin/index.tpl b/htdocs/theme/raw/templates/admin/index.tpl
index fee498e060..8a76c1dce3 100644
--- a/htdocs/theme/raw/templates/admin/index.tpl
+++ b/htdocs/theme/raw/templates/admin/index.tpl
@@ -89,7 +89,7 @@
         <div class="panel panel-info site-stats">
             <h3 class="panel-heading">{$sitedata.name}: {str tag=siteinformation section=admin} <span class="icon icon-area-chart pls pull-right"></span></h3>
             {include file='admin/stats.tpl' full=0}
-            <a class="panel-footer" href="{$WWWROOT}admin/statistics.php">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right mls  pull-right"></span></a>
+            <a class="panel-footer text-small" href="{$WWWROOT}admin/statistics.php">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right mls  pull-right"></span></a>
         </div>
 
     {/if}
diff --git a/htdocs/theme/raw/templates/admin/institutionuserstatssummary.tpl b/htdocs/theme/raw/templates/admin/institutionuserstatssummary.tpl
index ce6170707c..770a02bc83 100644
--- a/htdocs/theme/raw/templates/admin/institutionuserstatssummary.tpl
+++ b/htdocs/theme/raw/templates/admin/institutionuserstatssummary.tpl
@@ -1,12 +1,12 @@
 <h3 class="mt0">{str tag=youraverageuser section=admin}</h3>
-<ul class="list-group unstyled pull-left">
+<ul class="list-group list-group-lite unstyled">
   <li class="list-group-item">{$data.strmaxfriends|safe}</li>
   <li class="list-group-item">{$data.strmaxviews|safe}</li>
   <li class="list-group-item">{$data.strmaxgroups|safe}</li>
   <li class="list-group-item">{$data.strmaxquotaused|safe}</li>
 </ul>
 {if $data}
-    <div id="site-stats-graph" class="pull-right">
+    <div id="site-stats-graph">
         <canvas class="graphcanvas" id="sitestatsusersgraph" width="300" height="300"></canvas>
         <script type="application/javascript">
         {literal}
diff --git a/htdocs/theme/raw/templates/admin/registersite.tpl b/htdocs/theme/raw/templates/admin/registersite.tpl
index cd92be9ddf..434a572229 100644
--- a/htdocs/theme/raw/templates/admin/registersite.tpl
+++ b/htdocs/theme/raw/templates/admin/registersite.tpl
@@ -7,7 +7,7 @@
         {str tag=registeryourmaharasite section=admin}
     </h1>
     <div class="panel panel-default col-md-9">
-        <div class="panel-body ptxl">
+        <div class="panel-body">
         {if get_config('new_registration_policy')}
             {str tag=newsiteregistrationpolicy section=admin}
         {/if}
@@ -20,7 +20,4 @@
         </div>
     </div>
 </div>
-
-
-
 {include file='footer.tpl'}
diff --git a/htdocs/theme/raw/templates/admin/site/licenses.tpl b/htdocs/theme/raw/templates/admin/site/licenses.tpl
index 679243e28e..4dac1d4fb6 100644
--- a/htdocs/theme/raw/templates/admin/site/licenses.tpl
+++ b/htdocs/theme/raw/templates/admin/site/licenses.tpl
@@ -1,13 +1,18 @@
 {include file="header.tpl"}
-
+{if $allowextralicenses}
+<div class="text-right btn-top-right btn-group btn-group-top">
+    <a href="license-edit.php?add=add" class="btn btn-default">
+        <span class="icon icon-plus prs"></span>
+        {str tag=addsitelicense section=admin}
+    </a>
+</div>
+{/if}
 <div class="row">
-    <div class="col-md-9">
+    <div class="col-md-12">
         <p class='lead'>{str tag=sitelicensesdescription section=admin}</p>
         {if !$enabled}
         <p class="alert alert-warning">{str tag=sitelicensesdisablednote section=admin args=$WWWROOT}</p>
         {/if}
-    </div>
-    <div class="col-md-12">
         <div class="panel panel-default">
             <div class="panel-body">
                 <form id="sitelicenses" action="" method="post" name="sitelicenses">
@@ -49,10 +54,6 @@
                     {/foreach}
                     </tbody>
                 </table>
-                <a href="license-edit.php?add=add" class="btn btn-default">
-                    <span class="icon icon-plus prs"></span>
-                    {str tag=addsitelicense section=admin}
-                </a>
                 {if $extralicenses}
                     <p>{str tag=extralicensesdescription section=admin}</p>
                     <ul>
diff --git a/htdocs/theme/raw/templates/admin/site/menu.tpl b/htdocs/theme/raw/templates/admin/site/menu.tpl
index 0d9599d562..b0c1c6c4b6 100644
--- a/htdocs/theme/raw/templates/admin/site/menu.tpl
+++ b/htdocs/theme/raw/templates/admin/site/menu.tpl
@@ -1,8 +1,5 @@
 {include file="header.tpl"}
 <div class="row">
-    <div class="col-md-9">
-       
-    </div>
     <div class="col-md-9" id="editmenus">
         <div class="panel panel-default">
             <h3 class="panel-heading">{str tag=linksandresourcesmenu section=admin }</h3>
@@ -19,19 +16,17 @@
                     </span>
                     {contextualhelp plugintype='core' pluginname='admin' section='adminmenuselect'}
                 </div>
-                
-
                 <div id="menuitemlist"></div>
             </div>
         </div>
         <div class="panel panel-default">
             <h3 class="panel-heading">{str tag=footermenu section=admin}</h3>
-                <div class="panel-body">
-                    <p class="lead pbl">{str tag=footermenudescription section=admin}</p>
-                    {$footerform|safe}
-                </div>
+            <div class="panel-body">
+                <p class="lead pbl">{str tag=footermenudescription section=admin}</p>
+                {$footerform|safe}
             </div>
-        <div>
+        </div>
     </div>
+</div>
 
 {include file="footer.tpl"}
diff --git a/htdocs/theme/raw/templates/admin/statistics.tpl b/htdocs/theme/raw/templates/admin/statistics.tpl
index aeca37dc8a..0869d39dbe 100644
--- a/htdocs/theme/raw/templates/admin/statistics.tpl
+++ b/htdocs/theme/raw/templates/admin/statistics.tpl
@@ -24,6 +24,7 @@
                     <h3>{$subpagedata.tabletitle}{if $subpagedata.help}{$subpagedata.help|safe}{/if}</h3>
                     {if $subpagedata.tablesubtitle}<div class="small">{$subpagedata.tablesubtitle}</div>{/if}
                 {if $subpagedata.table.count == 0}{else}
+                    <div class="table-responsive">
                         <table id="statistics_table" class="table table-striped fullwidth">
                             <thead>
                                 <tr>
@@ -36,6 +37,7 @@
                                 {$subpagedata.table.tablerows|safe}
                             </tbody>
                         </table>
+                    </div>
                         {$subpagedata.table.pagination|safe}
                 {/if}
                 </div>
diff --git a/htdocs/theme/raw/templates/admin/stats.tpl b/htdocs/theme/raw/templates/admin/stats.tpl
index 48a5f88bc7..0bf215e071 100644
--- a/htdocs/theme/raw/templates/admin/stats.tpl
+++ b/htdocs/theme/raw/templates/admin/stats.tpl
@@ -59,7 +59,11 @@
     <tr>
         <th>{str tag=Cron section=admin}</th>
         <td>{if $sitedata.cronrunning}{str tag=runningnormally section=admin}{else}
-                {if $sitedata.siteclosedbyadmin}{str tag=cronnotrunningsiteclosed section=admin}{else}{str tag=cronnotrunning1 section=admin}{/if}
+                {if $sitedata.siteclosedbyadmin}
+                    {str tag=cronnotrunningsiteclosed1 section=admin}
+                {else}
+                    {str tag=cronnotrunning2 section=admin}
+                {/if}
             {/if}</td>
     </tr>
   </table>
diff --git a/htdocs/theme/raw/templates/admin/userstatssummary.tpl b/htdocs/theme/raw/templates/admin/userstatssummary.tpl
index b7b18ed60f..076cd5c553 100644
--- a/htdocs/theme/raw/templates/admin/userstatssummary.tpl
+++ b/htdocs/theme/raw/templates/admin/userstatssummary.tpl
@@ -1,5 +1,5 @@
 <h3 class="mt0">{str tag=youraverageuser section=admin}</h3>
-<ul class="list-group unstyled pull-left">
+<ul class="list-group list-group-lite unstyled">
   <li class="list-group-item">{$data.strmaxfriends|safe}</li>
   <li class="list-group-item">{$data.strmaxviews|safe}</li>
   <li class="list-group-item">{$data.strmaxgroups|safe}</li>
diff --git a/htdocs/theme/raw/templates/admin/viewstatssummary.tpl b/htdocs/theme/raw/templates/admin/viewstatssummary.tpl
index dac5b62bad..6481d7d48f 100644
--- a/htdocs/theme/raw/templates/admin/viewstatssummary.tpl
+++ b/htdocs/theme/raw/templates/admin/viewstatssummary.tpl
@@ -15,7 +15,7 @@
         </script>
     </div>
 {/if}
-<ul class="list-group unstyled pull-left">
+<ul class="list-group list-group-lite unstyled pull-left">
 {foreach from=$blocktypecounts item=item}
   <li class="list-group-item">{str tag=title section=blocktype.$item->langsection}: {$item->blocks}</li>
 {/foreach}
diff --git a/htdocs/theme/raw/templates/collection/index.tpl b/htdocs/theme/raw/templates/collection/index.tpl
index 766812be63..f3c4774240 100644
--- a/htdocs/theme/raw/templates/collection/index.tpl
+++ b/htdocs/theme/raw/templates/collection/index.tpl
@@ -63,10 +63,8 @@
 </div>
        {$pagination|safe}
 {else}
-     <div class="mtxl ptxl">
-        <p class="lead mtxl ptxl pbxl text-center ">
-            {str tag=nocollections section=collection}{if $addonelink} <a href={$addonelink}>{str tag=addone}</a>{/if}
-        </p>
-    </div>
+    <p class="no-results">
+        {str tag=nocollections section=collection}{if $addonelink} <a href={$addonelink}>{str tag=addone}</a>{/if}
+    </p>
 {/if}
 {include file="footer.tpl"}
diff --git a/htdocs/theme/raw/templates/collection/views.json.tpl b/htdocs/theme/raw/templates/collection/views.json.tpl
index 15d0c118a3..afa43112b1 100644
--- a/htdocs/theme/raw/templates/collection/views.json.tpl
+++ b/htdocs/theme/raw/templates/collection/views.json.tpl
@@ -23,11 +23,9 @@
                     </a>
                 {/if}
             {/if}
-            <strong>
-                <a href="{$view->fullurl}" class="text-link">
-                    {$view->title}
-                </a>
-            </strong>
+            <a href="{$view->fullurl}" class="text-link">
+                {$view->title}
+            </a>
             {$view->remove|safe}
         </li>
     {/foreach}
diff --git a/htdocs/theme/raw/templates/collection/views.tpl b/htdocs/theme/raw/templates/collection/views.tpl
index ee26e630e8..f9795d859a 100644
--- a/htdocs/theme/raw/templates/collection/views.tpl
+++ b/htdocs/theme/raw/templates/collection/views.tpl
@@ -59,11 +59,9 @@
                                     </a>
                                 {/if}
                             {/if}
-                            <strong>
-                                <a href="{$view->fullurl}" class="text-link">
-                                    {$view->title}
-                                </a>
-                            </strong>
+                            <a href="{$view->fullurl}" class="text-link">
+                                {$view->title}
+                            </a>
                             {$view->remove|safe}
                         </li>
 
diff --git a/htdocs/theme/raw/templates/collectionnav.tpl b/htdocs/theme/raw/templates/collectionnav.tpl
index 6c0e82e946..7da4741994 100644
--- a/htdocs/theme/raw/templates/collectionnav.tpl
+++ b/htdocs/theme/raw/templates/collectionnav.tpl
@@ -1,7 +1,12 @@
 <div id="collectionnavwrap" class="collection-nav">
     {if count($collection) > 1}
-        <button type="button" class="btn btn-default prevpage invisible">{str tag="prevpage" section="collection"}</button>
-        <button type="button" class="btn btn-default nextpage invisible">{str tag="nextpage" section="collection"}</button>
+        <button type="button" class="btn btn-default prevpage invisible">
+            <span class="icon left icon-chevron-left"></span>
+            {str tag="prevpage" section="collection"}
+        </button>
+        <button type="button" class="btn btn-default nextpage invisible">   {str tag="nextpage" section="collection"}
+            <span class="icon right icon-chevron-right"></span>
+        </button>
     {/if}
 
     {if $maintitle}<h2>{str tag="Collection" section="collection"}: {$maintitle|safe}</h2>{/if}
diff --git a/htdocs/theme/raw/templates/form/emaillist.tpl b/htdocs/theme/raw/templates/form/emaillist.tpl
index ce1a94a067..5afc1c5d2a 100644
--- a/htdocs/theme/raw/templates/form/emaillist.tpl
+++ b/htdocs/theme/raw/templates/form/emaillist.tpl
@@ -56,9 +56,9 @@
             return false;
         }
 
-        {{$name}}_newrefinput = INPUT({'type': 'text', 'class': 'form-control text', 'id': 'addnew{{$name}}'});
+        {{$name}}_newrefinput = INPUT({'type': 'text', 'id': 'addnew{{$name}}', 'class': 'form-control'});
         {{$name}}_newrefsubmit = INPUT({'type': 'submit', 'class': 'btn btn-default', 'value': '{{$addbuttonstr}}'});
-        {{$name}}_newref = DIV(null,{{$name}}_newrefinput,' ',{{$name}}_newrefsubmit);
+        {{$name}}_newref = DIV({'class': 'input-group'},{{$name}}_newrefinput,' ',{{$name}}_newrefsubmit);
 
         appendChildNodes('{{$name}}_list', {{$name}}_newref);
 
@@ -127,7 +127,7 @@
 {{/foreach}}
 </div>
 <button class="btn btn-default btn-sm align-with-input" onclick="{{$name}}_new(); return false;">
-    <span class="icon icon-plus prs icon-lg"> </span>
+    <span class="icon icon-plus left text-success icon-lg"> </span>
     {{str tag="addemail"}}
 </button>
 {{/if}}
diff --git a/htdocs/theme/raw/templates/group/group.tpl b/htdocs/theme/raw/templates/group/group.tpl
index 14bb6d1c5a..57b2092ad9 100644
--- a/htdocs/theme/raw/templates/group/group.tpl
+++ b/htdocs/theme/raw/templates/group/group.tpl
@@ -2,37 +2,34 @@
     <a href="{group_homepage_url($group)}" class="outer-link"><span class="sr-only">{$group->name}</span></a>
     <div class="row">
         <div class="col-sm-8">
-            <h4 class="list-group-item-heading">
+            <h3 class="list-group-item-heading text-inline">
                 {$group->name}
-                {if $group->settingsdescription}
-                <span class="metadata">
-                    - {$group->settingsdescription}
-                </span>
-                {/if}
-            </h4>
+            </h3>
+            {if $group->settingsdescription}
+            <span class="text-lighttone">
+                - {$group->settingsdescription}
+            </span>
+            {/if}
 
+            <p class="groupdesc">
+                {$group->description|str_shorten_html:100:true:true:false|safe}
+            </p>
             <div class="groupsdetails text-small">
-
-                <div class="mtm mbm">
-                    {$group->description|str_shorten_html:100:true:true:false|safe}
-                </div>
                  {if $group->editwindow}
-                <div class="groupeditable detail">
+                <div class="groupeditable">
                     {str tag=editable section=group}:
-                   {$group->editwindow}
+                    {$group->editwindow}
                 </div>
                 {/if}
-                <div class="groupadmin detail">
-                    {str tag=groupadmins section=group}:
+                <div class="groupadmin">
+                    <strong>{str tag=groupadmins section=group}:</strong>
                     {foreach name=admins from=$group->admins item=user}
-                    <em>
                         <a href="{profile_url($user)}" class="inner-link"> {$user|display_name}</a>
-                    </em>
                     {if !$.foreach.admins.last},
                     {/if}{/foreach}
                 </div>
                 {if $group->membercount}
-                    <div class="membernumber ">
+                    <div class="membernumber">
                         <a href="{$WWWROOT}group/members.php?id={$group->id}" class="inner-link">
                             {str tag=Members section=group}: {$group->membercount}
                         </a>
diff --git a/htdocs/theme/raw/templates/group/invite.tpl b/htdocs/theme/raw/templates/group/invite.tpl
index 3a290552e3..4f943c14b2 100644
--- a/htdocs/theme/raw/templates/group/invite.tpl
+++ b/htdocs/theme/raw/templates/group/invite.tpl
@@ -1,5 +1,4 @@
 {include file="header.tpl"}
 <h2>{$subheading}</h2>
-{include file="group/simplegroup.tpl" group=$GROUP}
 {$form|safe}
 {include file="footer.tpl"}
diff --git a/htdocs/theme/raw/templates/group/membersearchresults.tpl b/htdocs/theme/raw/templates/group/membersearchresults.tpl
index 12e6d062a1..11ba9081d2 100644
--- a/htdocs/theme/raw/templates/group/membersearchresults.tpl
+++ b/htdocs/theme/raw/templates/group/membersearchresults.tpl
@@ -4,66 +4,53 @@
 <div class="list-group-item {if $membershiptype == 'invite' || $membershiptype == 'request'} list-group-item-warning{/if}">
     <a href="{profile_url($r)}" class="outer-link"><span class="sr-only">{$r.name}</span></a>
      <div class="row">
-
         <div class="col-sm-8">
-            <div class="user-icon mts mrm pull-left">
-                <img src="{profile_icon_url user=$r maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$r|display_default_name}">
+            <div class="heading">
+                <div class="user-icon mt0 pull-left">
+                    <img src="{profile_icon_url user=$r maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$r|display_default_name}">
+                </div>
             </div>
-
-            <div class="pull-left with-user-icon">
-                <h4 class="list-group-item-heading">
-                    {$r.name}
-
-                    {if $r.role}
-                    <span class="grouprole metadata"> -
-                        {$results.roles[$r.role]->display}
-                        {if $caneditroles && $r.canchangerole}
-                        <a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}" class="inner-link text-link">
-                            [{str tag=changerole section=group}]
-                        </a>
-                    {/if}
-                    </span>
-                    {/if}
-
-                </h4>
+            <h4 class="list-group-item-heading with-user-icon">
+                {$r.name}
                 {if $r.role}
-                <div class="rel">
-                    <div class="detail mts">
-                        {$r.introduction|str_shorten_html:80:true:true:false|safe}
-                    </div>
-
-                    <div class="jointime detail mtm">
-                        <span class="lead text-small">
-                            {str tag="Joined" section="group"}:
-                        </span>
-                        {$r.jointime}
-                    </div>
-
-                </div>
-
-                {elseif $membershiptype == 'request'}
-                <div class="hasrequestedmembership detail mts">
-                    {str tag=hasrequestedmembership section=group}.
-
-                    {if $r.reason}
-                    <p class="ptm">
-                        <span class="lead text-small">{str tag=reason}:</span>
-                        {$r.reason|format_whitespace|safe}
-                    </p>
+                <span class="grouprole text-small text-midtone"> -
+                    {$results.roles[$r.role]->display}
+                    {if $caneditroles && $r.canchangerole}
+                    <a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}" class="inner-link text-link">
+                        [{str tag=changerole section=group}]
+                    </a>
                     {/if}
+                </span>
+                {/if}
+            </h4>
+            {if $r.role}
+            <div class="introduction detail with-user-icon text-small mtm">
+                <span>{$r.introduction|str_shorten_html:80:true:true:false|safe}
+                </span>
 
+                <div class="jointime">
+                    <strong>
+                        {str tag="Joined" section="group"}:
+                    </strong>
+                    {$r.jointime}
                 </div>
-
-                {elseif $membershiptype == 'invite'}
-                <div class="detail mts">
-                    {str tag=hasbeeninvitedtojoin section=group}
+            </div>
+            {elseif $membershiptype == 'request'}
+            <div class="requestedmembership detail with-user-icon text-small mtm">
+                {str tag=hasrequestedmembership section=group}.
+                {if $r.reason}
+                <div>
+                    <strong>{str tag=reason}:</strong>
+                    {$r.reason|format_whitespace|safe}
                 </div>
-
                 {/if}
             </div>
-
+            {elseif $membershiptype == 'invite'}
+            <div class="invited detail with-user-icon text-small mtm">
+                {str tag=hasbeeninvitedtojoin section=group}
+            </div>
+            {/if}
         </div>
-
         <div class="col-sm-4">
             <div class="inner-link btn-action-list">
                 <div class="text-right btn-top-right btn-group btn-group-top">
diff --git a/htdocs/theme/raw/templates/group/simplegroup.tpl b/htdocs/theme/raw/templates/group/simplegroup.tpl
deleted file mode 100644
index 2ac5b4b70e..0000000000
--- a/htdocs/theme/raw/templates/group/simplegroup.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <h3>
-        <a href="{group_homepage_url($group)}">
-            {$group->name}
-        </a>
-    </h3>
-    {if $group->description}
-    <p>
-        {$group->description|clean_html|safe}
-    </p>
-    {/if}
-</div>
diff --git a/htdocs/theme/raw/templates/group/topicrows.tpl b/htdocs/theme/raw/templates/group/topicrows.tpl
index d1fbc440bf..9ea7b36784 100644
--- a/htdocs/theme/raw/templates/group/topicrows.tpl
+++ b/htdocs/theme/raw/templates/group/topicrows.tpl
@@ -1,8 +1,8 @@
 {foreach from=$topics item=topic}
-    <tr>
+    <tr class="{cycle name=rows values='r0,r1'}">
         <td>
             <h3 class="title"><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->topicname|str_shorten_text:65:true}</a></h3>
-            <div class="forumpath metadata pts">
+            <div class="forumpath text-small text-lighttone pts">
                 <a href="{$topic->groupurl}" class="topicgroup text-muted">{$topic->groupname|str_shorten_text:20:true}</a> /
                 <a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}" class="topicforum  text-muted">{$topic->forumname|str_shorten_text:20:true}</a>
             </div>
@@ -13,7 +13,7 @@
                 {$topic->body|str_shorten_html:80:true|strip_tags|safe}
             </p>
 
-            <span class="poster metadata">
+            <span class="poster text-small text-lighttone">
                 <a href="{profile_url($topic->poster)}">
                     {$topic->poster|display_name}
                 </a>
diff --git a/htdocs/theme/raw/templates/group/topics.tpl b/htdocs/theme/raw/templates/group/topics.tpl
index 600db4784e..6c77ca52ec 100644
--- a/htdocs/theme/raw/templates/group/topics.tpl
+++ b/htdocs/theme/raw/templates/group/topics.tpl
@@ -1,7 +1,7 @@
 {include file="header.tpl"}
 <p class="lead">{str tag=activetopicsdescription section=interaction.forum}</p>
 <div class="table-responsive">
-    <table id="topiclist" class="table fullwidth table-striped table-padded">
+    <table id="topiclist" class="table fullwidth table-padded">
         <thead>
             <tr>
                 <th>{str tag=Topic section=interaction.forum}</th>
diff --git a/htdocs/theme/raw/templates/group/view.tpl b/htdocs/theme/raw/templates/group/view.tpl
index b9d97a8af4..7b0f860630 100644
--- a/htdocs/theme/raw/templates/group/view.tpl
+++ b/htdocs/theme/raw/templates/group/view.tpl
@@ -1,7 +1,7 @@
 {include file="header.tpl"}
 
 {if $GROUP->description}
-    <div class="groupdescription lead">
+    <div class="groupdescription pagedescription lead">
         {$GROUP->description|clean_html|safe}
     </div>
 {/if}
diff --git a/htdocs/theme/raw/templates/skin/index.tpl b/htdocs/theme/raw/templates/skin/index.tpl
index ee6328eaad..16da7bbde2 100644
--- a/htdocs/theme/raw/templates/skin/index.tpl
+++ b/htdocs/theme/raw/templates/skin/index.tpl
@@ -24,7 +24,6 @@
     {foreach from=$skins item=skin}
     <div class="panel panel-default">
         <h2 class="panel-heading {if $skin.metadata} has-link {/if}">
-            {if $skin.metadata && $skin.editable}
             <a href="" type="button" title="{str tag='viewmetadata' section='skin'}" class="title-link" data-toggle="modal" data-target="#skindata-modal-{$skin.id}" aria-labelledby="skin-info">
                 {$skin.title|escape}
                 <span class="icon icon-info-circle pull-right link-indicator"></span>
@@ -32,9 +31,6 @@
                     {str tag=viewmetadataspecific section=skin arg1=$skin.title}
                 </span>
             </a>
-            {else}
-                {$skin.title|escape}
-            {/if}
         </h2>
 
         <div class="skin-content">
@@ -43,7 +39,7 @@
                 <img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreviewedit section=skin arg1=$skin.title)|escape}" width="100%">
             </a>
             {else}
-            <img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreview section=skin arg1=$skin.title)|escape}" width="240" height="135">
+            <img src="{$WWWROOT}skin/thumb.php?id={$skin.id}" alt="{str(tag=skinpreview section=skin arg1=$skin.title)|escape}" width="100%">
             {/if}
         </div>
         <div class="skin-controls panel-footer">
@@ -59,7 +55,7 @@
 
             {if $skin.removable}
             <a href="{$WWWROOT}skin/export.php?id={$skin.id}" title="{str tag='exportthisskin' section='skin'}" class="btn btn-default btn-xs">
-                <span class="icon icon-external-link icon-lg"></span>
+                <span class="icon icon-download icon-lg"></span>
                 <span class="sr-only">
                     {str tag=exportspecific section=skin arg1=$skin.title}
                 </span>
diff --git a/htdocs/theme/raw/templates/user/user.tpl b/htdocs/theme/raw/templates/user/user.tpl
index f5b1a83d76..f55076e033 100644
--- a/htdocs/theme/raw/templates/user/user.tpl
+++ b/htdocs/theme/raw/templates/user/user.tpl
@@ -1,13 +1,13 @@
-<div class="{if $user->pending}pending panel-warning{else}panel-default{/if} panel panel-half">
+<div class="{if $user->pending}pending panel-warning{else}panel-default{/if} panel panel-half myfriend">
     <h3 class="panel-heading profile-block">
         <a href="{profile_url($user)}" class="prxxl mrl">
             {$user->display_name}
             {if $user->pending}
-            <em class="text-small pendingfriend"> 
+            <em class="text-small pendingfriend">
             - {str tag='pendingsince' section='group' arg1=$user->pending_time}
             </em>
             {elseif $user->friend && $page == 'find'}
-            <em class="text-small existingfriend"> 
+            <em class="text-small existingfriend">
             - {str tag='existingfriend' section='group'}
             </em>
             {/if}
@@ -18,18 +18,18 @@
     </h3>
     <div class="panel-body">
         {if $user->institutions}
-        <div class="memberof detail pbm prxxl">
+        <div class="memberof detail with-user-icon-lg">
             <span class="icon icon-university prs"></span>
             {$user->institutions|safe}
         </div>
         {/if}
         <div class="content pbm">
             {if $user->introduction}
-            <p class="intro prxxl">
+            <p class="intro">
                 {$user->introduction|str_shorten_html:100:true|safe}
             </p>
             {/if}
-            
+
             {if $user->friend && $page == 'myfriends' && $user->views}
             <p class="viewlist">
                 <span class="lead text-small">
@@ -42,7 +42,7 @@
                 {/foreach}
             </p>
             {/if}
-            
+
             {if $user->pending}
             <div class="whymakemeyourfriend">
                 <span class="lead text-small">
@@ -53,7 +53,7 @@
             {/if}
         </div>
         {if $user->messages}
-        <div class="sendmessage text-small prxxl">
+        <div class="sendmessage text-small">
             <span class="icon icon-envelope prs"></span>
             <a href="{$WWWROOT}{if $mrmoduleactive}module/multirecipientnotification{else}user{/if}/sendmessage.php?id={$user->id}&amp;returnto={$page}&amp;offset={$offset}" class="text-right" title="{str tag='sendmessage' section='group'}">
             {str tag='sendmessage' section='group'}
@@ -61,7 +61,7 @@
         </div>
         {/if}
         {if $admingroups}
-        <div class="editgroup text-small prxxl">
+        <div class="editgroup text-small">
             <span class="icon icon-pencil prs"></span>
             <a href="" onclick="showGroupBox(event, {$user->id})" class="btn-edit">{str tag='editgroupmembership' section='group'}</a>
         </div>
diff --git a/htdocs/theme/raw/templates/user/userfind.tpl b/htdocs/theme/raw/templates/user/userfind.tpl
index 6bee901c5b..fa242d0283 100644
--- a/htdocs/theme/raw/templates/user/userfind.tpl
+++ b/htdocs/theme/raw/templates/user/userfind.tpl
@@ -4,26 +4,30 @@
      </a>
     <div class="row" id="friendinfo_{$user->id}">
         <div class="col-sm-8">
-            <div class="user-icon mtxs mrm pull-left">
-                <img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$user|display_default_name}">
-            </div>
-            <div class="pull-left">
-                 <h4 class="list-group-item-heading">
+            <div class="clearfix mts heading">
+                <div class="user-icon pull-left">
+                    <img src="{profile_icon_url user=$user maxwidth=40 maxheight=40}" alt="{str tag=profileimagetext arg1=$user|display_default_name}">
+                </div>
+                <h4 class="list-group-item-heading">
                     {$user->display_name}
                     {if $user->pending}
-                    <span class="pendingfriend metadata"> - {str tag='pending' section='group'}</span>
+                    <span class="pendingfriend text-small text-lighttone">
+                        - {str tag='pending' section='group'}
+                    </span>
                     {elseif $user->friend && $page == 'find'}
-                    <span class="existingfriend metadata"> - {str tag='existingfriend' section='group'}</span>
+                    <span class="existingfriend text-small text-lighttone">
+                        - {str tag='existingfriend' section='group'}
+                    </span>
                     {/if}
                 </h4>
-                {if $user->institutions}
-                <p class="memberof mtm detail text-small">
-                    <span class="icon icon-lg text-default icon-university prs"></span>
-                    <span>
-                    {$user->institutions|safe}
-                </p>
-                {/if}
             </div>
+            {if $user->institutions}
+            <div class="memberof mtm detail text-small">
+                <span class="icon icon-lg text-default icon-university prs"></span>
+                <span>
+                {$user->institutions|safe}
+            </div>
+            {/if}
         </div>
         <div class="col-sm-4">
             <ul class="list-unstyled inner-link text-small">
diff --git a/htdocs/theme/raw/templates/user/view.tpl b/htdocs/theme/raw/templates/user/view.tpl
index d93d079b34..7ef79122f4 100644
--- a/htdocs/theme/raw/templates/user/view.tpl
+++ b/htdocs/theme/raw/templates/user/view.tpl
@@ -99,16 +99,16 @@
     {/if}
 
 <div class="row">
-    <div class="col-md-8 ptxl">
+    <div class="col-md-12 userdetail ptxl">
         {if $institutions}
         <p class="pll lead text-small">
-            <span class="icon icon-lg icon-university  prs"></span>
+            <span class="icon icon-lg icon-university left"></span>
             {$institutions|safe}
         </p>
         {/if}
         {if $invitedlist}
         <p class="pll lead text-small">
-            <span class="icon icon-lg icon-users prs"></span>
+            <span class="icon icon-lg icon-users left"></span>
             {str tag=groupinvitesfrom section=group}
             {$invitedlist}
         </p>
@@ -116,7 +116,7 @@
 
         {if $requestedlist}
         <p class="pll lead text-small">
-            <span class="icon icon-lg icon-users prs"></span>
+            <span class="icon icon-lg icon-users left"></span>
             {str tag=requestedmembershipin section=group}
             {$requestedlist}
         </p>
diff --git a/htdocs/theme/raw/templates/view/accesslistrow.tpl b/htdocs/theme/raw/templates/view/accesslistrow.tpl
index 15bdce79f5..39e7a8ea0c 100644
--- a/htdocs/theme/raw/templates/view/accesslistrow.tpl
+++ b/htdocs/theme/raw/templates/view/accesslistrow.tpl
@@ -1,6 +1,6 @@
-<th>
-    <a href="{$item.url}">{$item.name}</a>
-</th>
+<td>
+    <strong><a href="{$item.url}">{$item.name}</a></strong>
+</td>
 <td class="accesslist">
 {if $item.access}<div class="detail">{$item.access}</div>{/if}
 {if $item.accessgroups}
@@ -37,10 +37,10 @@
         <span class="sr-only">{str tag=editaccess}</span>
     </a>
 </td>
-<td class="secreturls text-center tiny active">
+<td class="secreturls text-right tiny active">
     <a title="{str tag=editsecreturlaccess section=view}" href="{$WWWROOT}view/urls.php?id={$item.viewid}{if $item.views}&collection={$item.id}{/if}" class="text-default">
-        <sup class="text-success">{$item.secreturls}</sup>
-        <span class="icon icon-globe icon-lg pull-right"></span>
+        <span>{$item.secreturls}</span>
+        <span class="icon icon-globe icon-lg right"></span>
         <span class="sr-only">{str tag=edit}</span>
     </a>
 </td>
diff --git a/htdocs/theme/raw/templates/view/blocks.tpl b/htdocs/theme/raw/templates/view/blocks.tpl
index e2122fa8e2..7551cc8e75 100644
--- a/htdocs/theme/raw/templates/view/blocks.tpl
+++ b/htdocs/theme/raw/templates/view/blocks.tpl
@@ -20,13 +20,15 @@
                 <div id="editcontent-sidebar" data-spy="affix" data-offset-top="420" data-offset-top="100" class="toolbar-affix">
                 {include file="view/contenteditor.tpl" selected='content' new=$new}
                 {if $viewthemes}
-                    <div id="select-theme">
-                        <div id="select-theme-header">{str tag=theme section=view}</div>
-                        <select id="viewtheme-select" name="viewtheme">
+                    <div id="select-theme" class="select dropdown">
+                        <label id="select-theme-header">{str tag=theme section=view}</label>
+                        <span class="picker">
+                        <select id="viewtheme-select" class="form-control select" name="viewtheme">
                         {foreach from=$viewthemes key=themeid item=themename}
                             <option value="{$themeid}"{if $themeid == $viewtheme} selected="selected"{/if}>{$themename}</option>
                         {/foreach}
                         </select>
+                        </span>
                     </div>
                 {/if}
                 </div>
diff --git a/htdocs/theme/raw/templates/view/delete.tpl b/htdocs/theme/raw/templates/view/delete.tpl
index 6f2f38c3e7..ebaede4177 100644
--- a/htdocs/theme/raw/templates/view/delete.tpl
+++ b/htdocs/theme/raw/templates/view/delete.tpl
@@ -5,7 +5,7 @@
         {str tag="deleteviewconfirm1" section="view"}
     </h2>
     <div class="panel-body">
-        <p class="lead text-small">{if $collectionnote}{$collectionnote|clean_html|safe}{/if}</p>
+        <p class="lead">{if $collectionnote}{$collectionnote|clean_html|safe}{/if}</p>
         <p>{if $view->get('owner')}
         {str tag="deleteviewconfirmbackup" section="view" arg1=$WWWROOT}
         {/if}</p>
diff --git a/htdocs/theme/raw/templates/view/edit.tpl b/htdocs/theme/raw/templates/view/edit.tpl
index b7454051b3..c454ace344 100644
--- a/htdocs/theme/raw/templates/view/edit.tpl
+++ b/htdocs/theme/raw/templates/view/edit.tpl
@@ -2,7 +2,7 @@
 
 {include file="view/editviewtabs.tpl" selected='title' new=$new issiteview=$issiteview}
 <div class="row">
-    <div class="col-md-8">
+    <div class="col-md-9">
     {$editview|safe}
     </div>
 </div>
diff --git a/htdocs/theme/raw/templates/view/groupviews.tpl b/htdocs/theme/raw/templates/view/groupviews.tpl
index 62f73a461e..3914fa8917 100644
--- a/htdocs/theme/raw/templates/view/groupviews.tpl
+++ b/htdocs/theme/raw/templates/view/groupviews.tpl
@@ -18,7 +18,7 @@
     </table>
     <div class="center">{$pagination|safe}</div>
 {else}
-<div class="lead text-small">{str tag="noviewstosee" section="group"}</div>
+<div class="no-results">{str tag="noviewstosee" section="group"}</div>
 {/if}
 
 {include file="footer.tpl"}
diff --git a/htdocs/theme/raw/templates/view/share.tpl b/htdocs/theme/raw/templates/view/share.tpl
index b5687f9930..6a000f2479 100644
--- a/htdocs/theme/raw/templates/view/share.tpl
+++ b/htdocs/theme/raw/templates/view/share.tpl
@@ -12,11 +12,9 @@
             </div>
         </div>
     {else}
-    <div class="mtxl ptxl">
-        <p class="lead mtxl ptxl text-center ">
-             {str tag=youhaventcreatedanyviewsyet section=view}
-        </p>
-    </div>
+    <p class="no-results">
+         {str tag=youhaventcreatedanyviewsyet section=view}
+    </p>
     {/if}
 
 {else}
diff --git a/htdocs/theme/raw/templates/view/sharedviewrows.tpl b/htdocs/theme/raw/templates/view/sharedviewrows.tpl
index 447a075851..918dd1fc90 100644
--- a/htdocs/theme/raw/templates/view/sharedviewrows.tpl
+++ b/htdocs/theme/raw/templates/view/sharedviewrows.tpl
@@ -15,19 +15,19 @@
           {else}
             {$view.sharedby}
           {/if}
-        <span class="postedon nowrap metadata"> - {$view.mtime|strtotime|format_date:'strftimerecentyear'}</span>
+        <span class="postedon text-lighttone"> - {$view.mtime|strtotime|format_date:'strftimerecentyear'}</span>
         </div>
         {/if}
         <div class="detail">{$view.description|str_shorten_html:70:true|strip_tags|safe}</div>
         {if $view.tags}<div class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$view.owner tags=$view.tags}</div>{/if}
       </td>
-      <td class="center">{$view.commentcount}</td>
+      <td class="text-center">{$view.commentcount}</td>
       <td class="lastcomment">
         {if $view.commenttext}
             <div class="comment">
                 <a href="{$WWWROOT}view/view.php?id={$view.lastcommentviewid}&showcomment={$view.commentid}" title="{str tag=viewcomment section=artefact.comment}">{$view.commenttext|str_shorten_html:40:true|strip_tags|safe}</a>
             </div>
-            <span class="postedon metadata text-block mbm">{$view.lastcommenttime|strtotime|format_date:'strftimerecentyear'}</span>
+            <span class="postedon text-lighttone text-block mbm">{$view.lastcommenttime|strtotime|format_date:'strftimerecentyear'}</span>
           {if $view.commentauthor}
             <span class="poster">
                 <a href="{profile_url($view.commentauthor)}">
diff --git a/htdocs/theme/raw/templates/view/sharedviews.tpl b/htdocs/theme/raw/templates/view/sharedviews.tpl
index a60ee19b66..3ad8c2be23 100644
--- a/htdocs/theme/raw/templates/view/sharedviews.tpl
+++ b/htdocs/theme/raw/templates/view/sharedviews.tpl
@@ -7,7 +7,7 @@
         <thead>
             <tr>
                 <th>{str tag=name}</th>
-                <th class="center">{str tag=Comments section=artefact.comment}</th>
+                <th class="text-center">{str tag=Comments section=artefact.comment}</th>
                 <th>{str tag=lastcomment section=artefact.comment}</th>
             </tr>
         </thead>
diff --git a/htdocs/theme/raw/templates/view/skin.tpl b/htdocs/theme/raw/templates/view/skin.tpl
index ec1ed737e7..d419f37bcf 100644
--- a/htdocs/theme/raw/templates/view/skin.tpl
+++ b/htdocs/theme/raw/templates/view/skin.tpl
@@ -96,8 +96,8 @@
                         {/foreach}
                     </div>
                 </div>
-                {if $favourskins}
-               <div class="panel panel-default collapsible collapsible-group first">
+                {if $favorskins}
+                <div class="panel panel-default collapsible collapsible-group">
                     <h3 class="panel-heading">
                         <a href="#favorskins" data-toggle="collapse" aria-expanded="false" aria-controls="#favorskins" class="collapsed">
                             {str tag=favoriteskins section=skin}
@@ -118,7 +118,7 @@
                     </div>
                 </div>
                 {/if}
-               <div class="panel panel-default collapsible collapsible-group last">
+                <div class="panel panel-default collapsible collapsible-group last">
                     <h3 class="panel-heading">
                         <a href="#siteskins" data-toggle="collapse" aria-expanded="false" aria-controls="#siteskins" class="collapsed">
                             {str tag=siteskins section=skin}
diff --git a/htdocs/theme/raw/templates/view/view.tpl b/htdocs/theme/raw/templates/view/view.tpl
index 18718e3d0c..05d462bf3f 100644
--- a/htdocs/theme/raw/templates/view/view.tpl
+++ b/htdocs/theme/raw/templates/view/view.tpl
@@ -77,7 +77,7 @@
     {/if}
 </div>
 
-<div class="pbxl with-heading metadata">
+<div class="pbxl with-heading text-small">
     {assign var='author_link_index' value=1}
     {include file=author.tpl}
 
@@ -181,7 +181,7 @@
                     <div class="modal-body">
                         <p>{str tag=confirmcopydesc section=view}</p>
                         <div class="btn-group">
-                            <button id="copy-collection-button" type="button" class="btn btn-default"><span class="icon icon-folder-open "></span> {str tag=Collection section=collection}</button>
+                            <button id="copy-collection-button" type="button" class="btn btn-default"><span class="icon icon-folder-open"></span> {str tag=Collection section=collection}</button>
                             <button id="copy-view-button" type="button" class="btn btn-default"><span class="icon icon-file-text "></span> {str tag=view}</button>
                         </div>
                     </div>
diff --git a/htdocs/user/requestfriendship.php b/htdocs/user/requestfriendship.php
index abdba3141b..7d9debdd1c 100644
--- a/htdocs/user/requestfriendship.php
+++ b/htdocs/user/requestfriendship.php
@@ -62,7 +62,7 @@ $form = pieform(array(
             ),
         ),
         'submit' => array(
-            'class' => 'btn-default',
+            'class' => 'btn-primary',
             'type' => 'submitcancel',
             'value' => array(get_string('requestfriendship', 'group'), get_string('cancel')),
             'goto' => $goto,
diff --git a/htdocs/view/urls.php b/htdocs/view/urls.php
index 956f8f580e..1becb66eb7 100644
--- a/htdocs/view/urls.php
+++ b/htdocs/view/urls.php
@@ -45,7 +45,7 @@ $newform = array(
         'submit' => array(
             'type'        => 'button',
             'usebuttontag' => true,
-            'class'       => 'btn-link',
+            'class'       => 'btn-default',
             'elementtitle' => get_string('generatesecreturl', 'view', hsc($title)),
             'value'       =>  '<span class="icon icon-plus icon-lg prs"></span> ' .get_string('newsecreturl', 'view'),
         ),
diff --git a/test/behat/features/blocktype/myviews.feature b/test/behat/features/blocktype/myviews.feature
index 27d419284a..7eb456f8cc 100644
--- a/test/behat/features/blocktype/myviews.feature
+++ b/test/behat/features/blocktype/myviews.feature
@@ -1,7 +1,8 @@
 @javascript @blocktype @blocktype_myviews
 Feature: The "My portfolios" block
-
 In order to be able to see a list of my pages and collections on my dashboard
+As as admin
+So I have fast access to them
 
 Background:
     Given the following "users" exist:
@@ -19,6 +20,7 @@ Background:
 Scenario: Testing that views & collections are collated properly in the "My portfolios" block
     Given I log in as "userA" with password "Password1"
     # I should see collections & individual pages
-    Then I should see "C1 (2 pages)" in the "div.bt-myviews" "css_element"
+    And I should see "C1" in the "div.list-group-item" "css_element"
+    And I should see "(2 pages)" in the "div.list-group-item" "css_element"
     And I should see "page P2" in the "div.bt-myviews" "css_element"
-    And I should not see "page P1A" in the "div.bt-myviews" "css_element"
+    Then I should not see "page P1A" in the "div.bt-myviews" "css_element"
diff --git a/test/behat/features/group/moving_pages_between_groups.feature b/test/behat/features/group/moving_pages_between_groups.feature
index 41a9463092..eee73a46f4 100644
--- a/test/behat/features/group/moving_pages_between_groups.feature
+++ b/test/behat/features/group/moving_pages_between_groups.feature
@@ -12,20 +12,20 @@ Scenario: Moving pages within a group (Bug 1426983)
     # Creating a group
     When I follow "Groups"
     And I follow "Create group"
-    And I fill in the following:
+    And I set the following fields to these values:
         | Group name    | Testing Group 1   |
     And I press "Save group"
     # Creating a forum
     And I follow "Forums (tab)"
     And I follow "New forum"
-    And I fill in the following:
+    And I set the following fields to these values:
         | Title    | Testing forum 1    |
     And I fill in "Testing forum" in WYSIWYG editor "edit_interaction_description_ifr"
     And I press "Save"
     And I follow "Forums (tab selected)"
     And I follow "General discussion"
     And I follow "New topic"
-    And I fill in the following:
+    And I set the following fields to these values:
         | Subject   | Testing topic 1   |
     And I fill in "Testing moving topic" in WYSIWYG editor "addtopic_body_ifr"
     And I press "Post"
-- 
GitLab