Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change

git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544

104 files changed, 365 insertions, 365 deletions

diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index d9e565ee6..0cd539ca4 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -8,10 +8,10 @@
 .blogpost {
 	border-bottom:1px dotted #CCCCCC;
 }
-.blogpost .entity_listing_icon {
+.blogpost .entity-listing-icon {
 	margin-top:6px;
 }
-.blogpost .entity_listing_info {
+.blogpost .entity-listing-info {
 	margin-top:4px;
 }
 .blog_post {
@@ -31,7 +31,7 @@
 }
 
 /* blogs list view */
-.entity_listing.blog .entity_metadata {
+.entity-listing.blog .entity-metadata {
 	min-width:400px;
 	text-align: right;
 }
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 5da9c3cd1..e9fb7d37f 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -167,7 +167,7 @@ $form_body = <<<___END
 
 $draft_warning
 
-<p class="margin_top">
+<p class="margin-top">
 	<label for="blog_title">$title_label</label>
 	$title_input
 </p>
@@ -204,7 +204,7 @@ $body_input
 $categories_input
 
 <div class="divider"></div>
-<p class="margin_none margin_top entity_subtext">
+<p class="margin-none margin-top entity-subtext">
 	$save_status <span class="blog_save_status_time">$saved</span>
 </p>
 
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index e53ba9e52..ecc479812 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -40,7 +40,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 				'text' => elgg_echo('blog:status:published')
 			));
 
-			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
+			$time = "<span class='entity-subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
 
 			echo '<li>
 			' . $load . ": $time
@@ -48,7 +48,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		}
 
 		foreach ($revisions as $revision) {
-			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
+			$time = "<span class='entity-subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
 			if ($revision->name == 'blog_auto_save') {
 				$revision_lang = elgg_echo('blog:auto_saved_revision');
 			} else {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 91fc7f594..733d42fa4 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -49,7 +49,7 @@ $edit = elgg_view('output/access', array('entity' => $vars['entity']));
 
 if ($blog->canEdit()) {
 	$edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-	$edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
+	$edit_link = "<span class='entity-edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
 
 	$delete_url = "action/blog/delete?guid={$blog->getGUID()}";
 	$delete_link = "<span class='delete-button'>" . elgg_view('output/confirmlink', array(
@@ -77,15 +77,15 @@ if ($full) {
 echo <<<___END
 <div class="blogpost clearfix">
 	<div id="content_header" class="clearfix">
-		<div class="content_header_title"><h2>{$blog->title}</h2></div>
+		<div class="content-header-title"><h2>{$blog->title}</h2></div>
 	</div>
 	<div class="clearfix">
-	<div class="entity_listing_icon">
+	<div class="entity-listing-icon">
 		$owner_icon
 	</div>
-	<div class="entity_listing_info">
-		<div class="entity_metadata">$edit</div>
-		<p class="entity_subtext">
+	<div class="entity-listing-info">
+		<div class="entity-metadata">$edit</div>
+		<p class="entity-subtext">
 			$author_text
 			$date
 			$categories
@@ -101,14 +101,14 @@ ___END;
 
 } else {
 	echo <<<___END
-<div class="blog $status_class entity_listing clearfix">
-	<div class="entity_listing_icon">
+<div class="blog $status_class entity-listing clearfix">
+	<div class="entity-listing-icon">
 		$owner_icon
 	</div>
-	<div class="entity_listing_info">
-		<div class="entity_metadata">$edit</div>
-		<p class="entity_title">$linked_title</p>
-		<p class="entity_subtext">
+	<div class="entity-listing-info">
+		<div class="entity-metadata">$edit</div>
+		<p class="entity-title">$linked_title</p>
+		<p class="entity-subtext">
 			$author_text
 			$date
 			$categories
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index d311c5883..2b52429a6 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -10,7 +10,7 @@ $contents = strip_tags($object->excerpt);
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $title = elgg_echo('blog:river:create', array($url));
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 
 if (isloggedin()) {
 	$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 17a304d78..b1929486d 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -23,7 +23,7 @@ if (!$name && ($user = get_loggedin_user())) {
 <h3><?php echo elgg_echo('bookmarks:browser_bookmarklet')?></h3>
 <a href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/bookmarks/<?php echo $name; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo elgg_get_site_url(); ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
 <br />
-<a class="link" onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
+<a class="link" onclick="elgg_slide_toggle(this,'#elgg-sidebar','.bookmarklet');">Instructions</a>
 
 <div class="bookmarklet hidden">
 	<p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p>
diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
index 927ed445d..7273836e2 100644
--- a/mod/bookmarks/views/default/bookmarks/form.php
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -35,7 +35,7 @@ if(isset($vars['entity'])){
 	$url = "action/bookmarks/add";
 }
 ?>
-<form id="bookmark_edit_form" class="margin_top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
+<form id="bookmark_edit_form" class="margin-top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
 	<?php echo elgg_view('input/securitytoken'); ?>
 	<p>
 		<label>
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
index 83d6c97ea..50d4dbdb2 100755
--- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -17,19 +17,19 @@ if($bookmarks){
 		//get the time
 		$friendlytime = elgg_view_friendly_time($b->time_created);
 		
-	    $info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+	    $info = "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
 
 		//get the bookmark entries body
-		$info .= "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$b->address}\">{$b->title}</a></p>";
+		$info .= "<div class='entity-listing-info'><p class='entity-title'><a href=\"{$b->address}\">{$b->title}</a></p>";
 				
 		//get the user details
-		$info .= "<p class='entity_subtext'>{$friendlytime}</p>";
+		$info .= "<p class='entity-subtext'>{$friendlytime}</p>";
 		$info .= "</div>";
 		//display 
-		echo "<div class='entity_listing clearfix'>" . $info . "</div>";
+		echo "<div class='entity-listing clearfix'>" . $info . "</div>";
 	} 
 } else {
 	$create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add";
-	echo "<p class='margin_top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
+	echo "<p class='margin-top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
 }
 echo "</div>";
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 7438f1570..f90a2f355 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -47,7 +47,7 @@ if($is_group instanceof ElggGroup){
 }
 
 if($vars['entity']->description != '')
-	$view_notes = "<a class='link' onclick=\"elgg_slide_toggle(this,'.entity_listing','.note');\">note</a>";
+	$view_notes = "<a class='link' onclick=\"elgg_slide_toggle(this,'.entity-listing','.note');\">note</a>";
 else
 	$view_notes = '';
 if (@file_exists($faviconurl)) {
@@ -66,7 +66,7 @@ if($vars['entity']->canEdit()){
 				)) . "</span>";
 }
 
-$info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span>";
+$info = "<div class='entity-metadata'><span {$access_level}>{$object_acl}</span>";
 
 // include a view for plugins to extend
 $info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
@@ -74,14 +74,14 @@ $info .= elgg_view_likes($vars['entity']); // include likes
 
 //include edit and delete options
 if($vars['entity']->canEdit()){
-	$info .= "<span class='entity_edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
+	$info .= "<span class='entity-edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
 	$info .= $delete;
 }
 
 	$info .= "</div>";
 
-$info .= "<p class='entity_title'>$a_tag_title</p>";
-$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
+$info .= "<p class='entity-title'>$a_tag_title</p>";
+$info .= "<p class='entity-subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
 
 $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
 if (!empty($tags)) {
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 32434471b..956e84b1c 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -13,7 +13,7 @@ $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
 if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
 	$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
 }
-$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 if (isloggedin()){
 	$string .= "<a class='river_comment_form_button link'>Comment</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
index cbd0012bb..34b9ff834 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -45,7 +45,7 @@ if ($bookmarks) {
 
 		//display
 		echo "<div class='ContentWrapper bookmarks'>";
-		echo "<div class='shares_widget_content'>" . $info . "</div></div>";
+		echo "<div class='shares_widget-content'>" . $info . "</div></div>";
 	}
 
 	if ($num_bookmarks > $num) {
diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
index 0e2519690..54090b8fa 100644
--- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php
+++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
@@ -77,7 +77,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
@@ -144,7 +144,7 @@ $(document).ready(function () {
 		</td>
 		<td width="17px" align="right"></td>
 		<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-		<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+		<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 		</tr></table>
 		
 		<?php
@@ -189,7 +189,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
@@ -230,7 +230,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php
index 4697eedab..cc44d582f 100644
--- a/mod/ecml/views/default/embed/web_services/content.php
+++ b/mod/ecml/views/default/embed/web_services/content.php
@@ -62,7 +62,7 @@ echo "<div class='ecml_generated_code hidden'>ECML: <span id='ecml_code'></span>
 echo "<div class='embed_content_section preview hidden'><a class='ecml_embed_preview link'>Preview</a>";
 echo "<div id='ecml_preview' class='hidden'></div></div>";
 
-echo "<div class='divider margin_top'></div>";
+echo "<div class='divider margin-top'></div>";
 echo $embed;
 
 ?>
diff --git a/mod/ecml/views/default/settings/ecml/edit.php b/mod/ecml/views/default/settings/ecml/edit.php
index 1a918fa99..8c1a3b4a1 100644
--- a/mod/ecml/views/default/settings/ecml/edit.php
+++ b/mod/ecml/views/default/settings/ecml/edit.php
@@ -12,7 +12,7 @@ $perms = $vars['config']->ecml_permissions;
 ksort($views);
 ksort($keywords);
 
-echo '<p class="margin_top">' . elgg_echo('ecml:admin:instruction') . '</p>';
+echo '<p class="margin-top">' . elgg_echo('ecml:admin:instruction') . '</p>';
 
 // yes I'm using a table because this is table.
 $form_body = <<<___END
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 559cd456d..e87584205 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -79,37 +79,37 @@
 }
 
 /* entity listings */
-.embed_data .entity_listing_icon img {
+.embed_data .entity-listing-icon img {
 	cursor: pointer;
 }
-.embed_data .entity_listing  {
+.embed_data .entity-listing  {
 	border-bottom:none;
 }
 .embed_data:last-child {
 	border-bottom:1px dotted #CCCCCC;
 }
-.embed_modal_videolist .entity_listing_icon img {
+.embed_modal_videolist .entity-listing-icon img {
 	width:75px;
 	height:auto;
 }
-.embed_modal_document .embed_data .entity_listing_info {
+.embed_modal_document .embed_data .entity-listing-info {
 	margin-top:0;
 	margin-left:7px;
 }
-.embed_modal_tidypics .embed_data .entity_listing_info {
+.embed_modal_tidypics .embed_data .entity-listing-info {
 	margin-top:11px;
 }
-.embed_modal_file .embed_data .entity_listing_info {
+.embed_modal_file .embed_data .entity-listing-info {
 	margin-top:0px;
 	margin-left:9px;
 }
-.embed_data .entity_listing_info {
+.embed_data .entity-listing-info {
 	width:auto;
 	margin-top:15px;
 	margin-left:15px;
 	float:left;
 }
-.embed_data .entity_listing {
+.embed_data .entity-listing {
 	cursor:pointer;
 }
 
@@ -139,10 +139,10 @@
 #facebox .content p {
 	color:#333333;
 }
-#facebox .content p.entity_title {
+#facebox .content p.entity-title {
 	color:#666666;
 }
-#facebox .content .entity_listing:hover {
+#facebox .content .entity-listing:hover {
 	background-color: #eeeeee;
 }
 #facebox .content label {
@@ -153,19 +153,19 @@
 /* ***************************************
 	ELGG TABBED PAGE NAVIGATION
 *************************************** */
-#facebox .body .elgg_horizontal_tabbed_nav {
+#facebox .body .elgg-horizontal-tabbed-nav {
 	margin-bottom:5px;
 	padding: 0;
 	border-bottom: 2px solid #cccccc;
 	display:table;
 	width:100%;
 }
-#facebox .body .elgg_horizontal_tabbed_nav ul {
+#facebox .body .elgg-horizontal-tabbed-nav ul {
 	list-style: none;
 	padding: 0;
 	margin: 0;
 }
-#facebox .body .elgg_horizontal_tabbed_nav li {
+#facebox .body .elgg-horizontal-tabbed-nav li {
 	float: left;
 	border: 2px solid #cccccc;
 	border-bottom-width: 0;
@@ -176,7 +176,7 @@
 	-webkit-border-top-left-radius:5px;
 	-webkit-border-top-right-radius:5px;
 }
-#facebox .body .elgg_horizontal_tabbed_nav a {
+#facebox .body .elgg-horizontal-tabbed-nav a {
 	text-decoration: none;
 	display: block;
 	padding:3px 10px 0 10px;
@@ -184,15 +184,15 @@
 	height:21px;
 	color:#999999;
 }
-#facebox .body .elgg_horizontal_tabbed_nav a:hover {
+#facebox .body .elgg-horizontal-tabbed-nav a:hover {
 	background: #dedede;
 	color:#666666;
 }
-#facebox .body .elgg_horizontal_tabbed_nav .selected {
+#facebox .body .elgg-horizontal-tabbed-nav .selected {
 	border-color: #cccccc;
 	background: white;
 }
-#facebox .body .elgg_horizontal_tabbed_nav .selected a {
+#facebox .body .elgg-horizontal-tabbed-nav .selected a {
 	position: relative;
 	top: 2px;
 	background: white;
@@ -204,25 +204,25 @@
 #facebox .body .pagination {
 	float:right;	
 }
-#facebox .body .pagination .pagination_number {
+#facebox .body .pagination .pagination-number {
 	border:1px solid #999999; 
 	color:#666666;
 }
-#facebox .body .pagination .pagination_number:hover {
+#facebox .body .pagination .pagination-number:hover {
 	background-color:#aaaaaa; 
 	color:black;
 }
-#facebox .body .pagination .pagination_previous,
-#facebox .body .pagination .pagination_next {
+#facebox .body .pagination .pagination-previous,
+#facebox .body .pagination .pagination-next {
 	border:1px solid #999999; 
 	color:#666666;
 }
-#facebox .body .pagination .pagination_previous:hover,
-#facebox .body .pagination .pagination_next:hover {
+#facebox .body .pagination .pagination-previous:hover,
+#facebox .body .pagination .pagination-next:hover {
 	background-color:#aaaaaa; 
 	color:black;
 }
-#facebox .body .pagination .pagination_currentpage {
+#facebox .body .pagination .pagination-currentpage {
 	background-color:#666666; 
 	border:1px solid #666666; 
 	color:white;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index 2855a5576..21b296db4 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -149,9 +149,9 @@ $(document).ready(function() {
 		return false;
 	}
 
-	$('.pagination_number').click(elggPaginationClick);
-	$('.pagination_next').click(elggPaginationClick);
-	$('.pagination_previous').click(elggPaginationClick);
+	$('.pagination-number').click(elggPaginationClick);
+	$('.pagination-next').click(elggPaginationClick);
+	$('.pagination-previous').click(elggPaginationClick);
 });
 
 </script>
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index 8cc60753c..fc5545df0 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -41,8 +41,8 @@ if ($ecml_keyword) {
 }
 
 $icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
-$info = "<p class='entity_title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
-$info .= "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
+$info = "<p class='entity-title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
+$info .= "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
 
 // @todo is this approach better than inline js?
 echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
index fbc6a0340..4f4663f40 100644
--- a/mod/embed/views/default/embed/js.php
+++ b/mod/embed/views/default/embed/js.php
@@ -112,7 +112,7 @@ $.extend($.facebox, {
 	settings: {
 	opacity      : 0.7,
 	overlay      : true,
-	loadingImage : '<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif',
+	loadingImage : '<?php echo elgg_get_site_url(); ?>_graphics/ajax-loader_bw.gif',
 	closeImage   : '<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif',
 	imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
 	faceboxHtml  : '\
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
index bf306b4e7..c6595ab36 100644
--- a/mod/embed/views/default/object/file/embedlist.php
+++ b/mod/embed/views/default/object/file/embedlist.php
@@ -2,16 +2,16 @@
 	$file = $vars['entity'];
 	$friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
 	
-	$info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-	$info .= "<p class='entity_subtext'>{$friendlytime}";	
+	$info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
+	$info .= "<p class='entity-subtext'>{$friendlytime}";	
 	$icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
 ?>
 <div id="embed_entity_<?php echo $file->guid; ?>">
-	<div class="entity_listing clearfix">
-		<div class="entity_listing_icon">
+	<div class="entity-listing clearfix">
+		<div class="entity-listing-icon">
 			<?php echo $icon; ?>
 		</div>
-		<div class="entity_listing_info">
+		<div class="entity-listing-info">
 			<?php echo $info; ?>
 		</div>
 	</div>
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 32eeeffd8..e7a17adab 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -24,7 +24,7 @@
 
 	// handle case where friends don't have any files
 	if (empty($content)) {
-		$area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
+		$area2 .= "<p class='margin-top'>".elgg_echo("file:none")."</p>";
 	} else {
 		$area2 .= $content;
 	}
diff --git a/mod/file/index.php b/mod/file/index.php
index 5f1bc3400..06a5979d1 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -32,7 +32,7 @@
 	if ($get_filter) {
 		$area1 .= $get_filter;
 	} else {
-		$area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
+		$area2 .= "<p class='margin-top'>".elgg_echo("file:none")."</p>";
 	}
 
 	//get the latest comments on the current users files
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 46913dea7..7fff98c97 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -5,10 +5,10 @@
 	 * @package Elgg File Repository
 	 */
 ?>
-.files .entity_listing .entity_listing_info {
+.files .entity-listing .entity-listing-info {
 	width:453px;
 }
-.files .entity_listing:hover {
+.files .entity-listing:hover {
 	background-color: white;
 }
 
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 745c5f053..4c7321e48 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -30,11 +30,11 @@
             foreach($files as $f){
 
                 $mime = $f->mimetype;
-                echo "<div class='entity_listing clearfix'>";
-            	echo "<div class='entity_listing_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-            	echo "<div class='entity_listing_info'>";
-            	echo "<p class='entity_title'>" . $f->title . "</p>";
-            	echo "<p class='entity_subtext'>" . elgg_view_friendly_time($f->time_created) . "</p>";
+                echo "<div class='entity-listing clearfix'>";
+            	echo "<div class='entity-listing-icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+            	echo "<div class='entity-listing-info'>";
+            	echo "<p class='entity-title'>" . $f->title . "</p>";
+            	echo "<p class='entity-subtext'>" . elgg_view_friendly_time($f->time_created) . "</p>";
 		        echo "</div></div>";
 
         	}
@@ -47,7 +47,7 @@
 
 	} else {
 
-		echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+		echo "<p class='margin-top'>" . elgg_echo("file:none") . "</p>";
 
 	}
 
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
index b7b99e3b3..0ef99348c 100644
--- a/mod/file/views/default/file/upload.php
+++ b/mod/file/views/default/file/upload.php
@@ -38,7 +38,7 @@
 	
 	
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin-top">
 <p>
 	<label>
 <?php
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 3b9731ed6..37019c1aa 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -67,8 +67,8 @@
 
 		} else {
 
-			$info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
-			$info .= "<p class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+			$info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
+			$info .= "<p class='entity-subtext'><a href=\"".elgg_get_site_url()."pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 			$numcomments = elgg_count_comments($file);
 			if ($numcomments)
 				$info .= ", <a href=\"{$file->getURL()}\">" . elgg_echo("comments") . " (" . $numcomments . ")</a>";
diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php
index 41a968dce..ee7bbe3cc 100644
--- a/mod/file/views/default/widgets/filerepo/content.php
+++ b/mod/file/views/default/widgets/filerepo/content.php
@@ -51,7 +51,7 @@ if ($files) {
 			$mime = $f->mimetype;
 			echo "<div class='filerepo_widget_singleitem clearfix'>";
 			echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-			echo "<div class='filerepo_widget_content'>";
+			echo "<div class='filerepo_widget-content'>";
 			echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
 			echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
 			echo "</div></div>";
@@ -66,6 +66,6 @@ if ($files) {
 	echo "</div>";
 } else {
 
-	echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+	echo "<p class='margin-top'>" . elgg_echo("file:none") . "</p>";
 }
 ?>
\ No newline at end of file
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index e7daddb43..43473e261 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -46,7 +46,7 @@
 		$title = elgg_echo('groups:notfound');
 		
 		$area2 = elgg_view_title($title);
-		$area2 .= "<p class='margin_top'>".elgg_echo('groups:notfound:details')."</p>";
+		$area2 .= "<p class='margin-top'>".elgg_echo('groups:notfound:details')."</p>";
 		
 		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
 	}
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index af8c0a447..7d61e2514 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -35,7 +35,7 @@
 
 ?>
 <!-- display the input form -->
-<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin_top">
+<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin-top">
 <?php echo elgg_view('input/securitytoken'); ?>
 
 	<p>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 32e9f6ff3..d3eb7ac68 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -13,7 +13,7 @@
 	}
 	
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin-top">
 
 	<?php echo elgg_view('input/securitytoken'); ?>
 
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 3298a7450..279e11a20 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,7 +12,7 @@
 
 if ($friends) {
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin-top">
 
 <?php
 	echo elgg_view('input/securitytoken');
diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php
index 8cf2e4a76..2c75c0a77 100644
--- a/mod/groups/views/default/forum/maintopic.php
+++ b/mod/groups/views/default/forum/maintopic.php
@@ -13,38 +13,38 @@
 	

 ?>

 

-<div class="entity_listing topic clearfix">

+<div class="entity-listing topic clearfix">

 <a class="anchor_link" name="<?php echo $vars['entity']->id; ?>"></a>

 	<?php

 	// get infomation about the owner of the comment

 	if ($post_owner = get_user($vars['entity']->owner_guid)) {

 	    // display the user icon

-	    echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";

+	    echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";

 	    // display the user name

-	    echo "<div class='entity_listing_info'>";

+	    echo "<div class='entity-listing-info'>";

 	    // if comment owner, group owner, or site admin - display edit and delete options

 	    if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {

-			echo "<div class='entity_metadata'>";

+			echo "<div class='entity-metadata'>";

 	        echo "<span class='delete-button'>".elgg_view("output/confirmlink",array(

 				'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),

 				'text' => elgg_echo('delete'),

 				'confirm' => elgg_echo('deleteconfirm')

 				))."</span>";

-			echo "<span class='entity_edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";

+			echo "<span class='entity-edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";

 			echo "</div>";

 

 		}	    

 	    

-	    echo "<p class='entity_title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";

+	    echo "<p class='entity-title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";

 	} else {

-		echo "<div class='entity_listing_icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";

-		echo "<div class='entity_listing_info'><p class='entity_title'>" . elgg_echo('profile:deleteduser') . "</p>";

+		echo "<div class='entity-listing-icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";

+		echo "<div class='entity-listing-info'><p class='entity-title'>" . elgg_echo('profile:deleteduser') . "</p>";

 	}

 	

 	//display the date of the comment

-	echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";

-	echo "</div>"; // close entity_listing_info

-	echo "</div>"; // close entity_listing.topic

+	echo "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";

+	echo "</div>"; // close entity-listing-info

+	echo "</div>"; // close entity-listing.topic

 

 	//display the actual message posted

 	echo "<div class='topic_post maintopic'>";

diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index 1426ba274..fbe168588 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -5,13 +5,13 @@
 ?>
 
 <div id="content_header" class="clearfix">
-	<div class="content_header_title">
+	<div class="content-header-title">
 		<h2><?php echo elgg_echo("groups:forum"); ?></h2>
 	</div>
 	<?php // only show the add topic button if the user is a member
 		if(elgg_get_page_owner()->isMember(get_loggedin_user())) {
 	?>
-		<div class="content_header_options">
+		<div class="content-header-options">
 			<a class="action-button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
 		</div>
 	<?php
@@ -22,4 +22,4 @@
 if($vars['topics'])
 	echo $vars['topics'];
 else
-	echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
+	echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/closedmembership.php b/mod/groups/views/default/groups/closedmembership.php
index bf0db7e22..d5abe1e09 100644
--- a/mod/groups/views/default/groups/closedmembership.php
+++ b/mod/groups/views/default/groups/closedmembership.php
@@ -6,7 +6,7 @@
 	 */
 
 ?>
-<p class="margin_top">
+<p class="margin-top">
 <?php 
 echo elgg_echo('groups:closedgroup');
 if (isloggedin()) {
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index eb93c4bd9..dcda51fd8 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -14,7 +14,7 @@
 	/* wraps group lists on 
 	latest discussion, newest, popular */
 }
-.entity_subtext.groups {
+.entity-subtext.groups {
 	float:right;
 	width:300px;
 	text-align: right;
@@ -25,10 +25,10 @@
 	padding-bottom:40px;
 	border-bottom:1px solid #CCCCCC;
 }
-.entity_listing.topic .topic_post p {
+.entity-listing.topic .topic_post p {
 	margin:10px 0 5px 0;
 }
-.entity_listing.topic:hover {
+.entity-listing.topic:hover {
 	background-color: white;
 }
 
@@ -42,7 +42,7 @@
 
 
 /* GROUPS SIDEBAR ELEMENTS */
-#groupsearchform .search_input {
+#groupsearchform .search-input {
 	width:196px;
 }
 .featured_group {
@@ -52,7 +52,7 @@
 	float:left;
 	margin-right:10px;
 }
-.featured_group p.entity_title {
+.featured_group p.entity-title {
 	margin-bottom:0;
 }
 .member_icon {
@@ -130,17 +130,17 @@
 .group_tool_widget.activity a.river_comment_form_button,
 .group_tool_widget.activity .river_comments_tabs,
 .group_tool_widget.activity .river_content_display,
-.group_tool_widget.activity .river_comments,
+.group_tool_widget.activity .river-comments,
 .group_tool_widget.activity .river_link_divider,
-.group_tool_widget.activity .river_user_like_button {
+.group_tool_widget.activity .river_user-like_button {
 	display:none;
 }
-.group_tool_widget.activity .river_item .entity_subtext {
+.group_tool_widget.activity .river_item .entity-subtext {
 	padding:0;
 }
 
-/* override default entity_listing_info width */
-.group_tool_widget .entity_listing_info {
+/* override default entity-listing-info width */
+.group_tool_widget .entity-listing-info {
 	width:315px;
 }
 .group_widget_link {
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php
index 580f1ca0f..0f9a3bedf 100644
--- a/mod/groups/views/default/groups/featured.php
+++ b/mod/groups/views/default/groups/featured.php
@@ -18,8 +18,8 @@
 				'size' => 'tiny',
 			));
 				
-			echo "<div class='featured_group'>".$icon."<p class='entity_title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-			echo "<p class='entity_subtext'>" . $group->briefdescription . "</p></div>";
+			echo "<div class='featured_group'>".$icon."<p class='entity-title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+			echo "<p class='entity-subtext'>" . $group->briefdescription . "</p></div>";
 		}
 	}
 ?>
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
index 70d03e458..0ad9f2018 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/find.php
@@ -9,6 +9,6 @@ $tag_string = elgg_echo('groups:search:tags');
 ?>
 <h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
 <form id="groupsearchform" action="<?php echo elgg_get_site_url(); ?>pg/groups/world/" method="get">
-	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search-input" />
 	<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" />
 </form>
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index d78a47456..9b6f292e0 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -16,18 +16,18 @@ if($vars['entity']->forum_enable != 'no'){
         	    
                 $count_annotations = $f->countAnnotations("generic_comment");
                  
-        	    echo "<div class='entity_listing clearfix'>";
-        	    echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
-    	        echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
-    	        echo "<p class='entity_subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
+        	    echo "<div class='entity-listing clearfix'>";
+        	    echo "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+    	        echo "<div class='entity-listing-info'><p class='entity-title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
+    	        echo "<p class='entity-subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
     	        echo "</div>";
         }
     } else {
 	    if(elgg_get_page_owner()->isMember(get_loggedin_user())){
 			$create_discussion = elgg_get_site_url() . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid();
-			echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
+			echo "<p class='margin-top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
 		}else{
-			echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
+			echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
 		}
     }
 
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index aedb3f8e5..58ecf920f 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -14,7 +14,7 @@
 	 $url = elgg_get_site_url() . "pg/groups/world/";
 
 ?>
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <div class="group_count"><?php echo $num_groups . " " . elgg_echo("groups:count"); ?></div>
 <ul>
 	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
index 1466234ab..dc6bdb4a4 100644
--- a/mod/groups/views/default/groups/grouplisting.php
+++ b/mod/groups/views/default/groups/grouplisting.php
@@ -21,7 +21,7 @@ if($membership == ACCESS_PUBLIC) {
 	$mem = elgg_echo("groups:closed");
 }
 
-$info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
+$info .= "<p class='entity-subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
 
 //for admins only - display the feature or unfeature option
 if(isadminloggedin()) {
@@ -37,8 +37,8 @@ if(isadminloggedin()) {
 }
 
 $info .= "</p>";
-$info .= "<p class='entity_title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
-$info .= "<p class='entity_subtext'>" . $vars['entity']->briefdescription . "</p>";
+$info .= "<p class='entity-title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
+$info .= "<p class='entity-subtext'>" . $vars['entity']->briefdescription . "</p>";
 
 echo elgg_view_listing($icon, $info);
 
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 436901368..42928a12f 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -50,7 +50,7 @@ if ($vars['entity']->isMember($user)) {
 // build action buttons
 $action_buttons = '';
 if (!empty($actions)) {
-	$action_buttons = '<div class="content_header_options">';
+	$action_buttons = '<div class="content-header-options">';
 	foreach ($actions as $url => $action) {
 		$action_buttons .= "<a class=\"action-button\" href=\"$url\">$action</a>";
 	}
@@ -64,7 +64,7 @@ echo elgg_view('navigation/breadcrumbs');
 // build and display header
 echo <<<__HTML
 <div id="content_header" class="clearfix">
-	<div class="content_header_title">
+	<div class="content-header-title">
 		<h2>{$vars['entity']->name}</h2>
 	</div>
 	$action_buttons
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 4674a3c23..a1cca6489 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -6,9 +6,9 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 		if ($group instanceof ElggGroup) {
 		
 		?>
-		<div class="entity_listing group_invitations clearfix">
+		<div class="entity-listing group_invitations clearfix">
 			<?php
-				echo "<div class='entity_listing_icon'>";
+				echo "<div class='entity-listing-icon'>";
 				echo elgg_view("profile/icon", array(
 					'entity' => $group,
 					'size' => 'tiny',
@@ -17,7 +17,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 
 			$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
 			?>
-			<div class="entity_listing_info">
+			<div class="entity-listing-info">
 			<a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
 			<?php		
 				echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 					'text' => elgg_echo('delete'),
 				)));
 			
-			echo "<p class='entity_title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-			echo "<p class='entity_subtext'>" . $group->briefdescription . "</p>";
+			echo "<p class='entity-title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+			echo "<p class='entity-subtext'>" . $group->briefdescription . "</p>";
 
 			?>
 		</div></div>
@@ -35,6 +35,6 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 		}
 
 	} else {
-		echo "<p class='default_string margin_top'>" . elgg_echo('groups:invitations:none') . "</p>";
+		echo "<p class='default_string margin-top'>" . elgg_echo('groups:invitations:none') . "</p>";
 }
 ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 6cb5f75f6..714b8e8f9 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -6,9 +6,9 @@
 				if ($request instanceof ElggUser) {
 	
 	?>
-		<div class="entity_listing group_invitations clearfix">
+		<div class="entity-listing group_invitations clearfix">
 				<?php
-					echo "<div class='entity_listing_icon'>";
+					echo "<div class='entity-listing-icon'>";
 					echo elgg_view("profile/icon", array(
 						'entity' => $request,
 						'size' => 'small',
@@ -18,7 +18,7 @@
 					
 					$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
 					?>
-					<div class="entity_listing_info">
+					<div class="entity-listing-info">
 					<a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
 					<?php	
 					echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@
 						'confirm' => elgg_echo('groups:joinrequest:remove:check'),
 						'text' => elgg_echo('delete'),
 					)));
-				echo "<p class='entity_title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
-				echo "<p class='entity_subtext'>" . $request->briefdescription . "</p>";
+				echo "<p class='entity-title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
+				echo "<p class='entity-subtext'>" . $request->briefdescription . "</p>";
 				?>
 			</div>
 		</div>
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index efa4dee79..551e256db 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -27,32 +27,32 @@ $u = get_user($last_user);
 if (elgg_get_context() == "search") {
 	var_export($counter);
 	if($counter == 1){
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
 	}else{
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
 	}
 	if (($last_time) && ($u)) $info.= elgg_echo('groups:lastupdated', array(elgg_view_friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>"));
 	$info .= '</p>';
 	//get the group avatar
 	$icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny'));
 	//get the group and topic title
-	$info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+	$info .= "<p class='entity-subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 	if ($group instanceof ElggGroup) {
-		$info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
+		$info .= "<p class='entity-title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
 	}
 
 } else {
 	if($counter == 1){
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
 	}else{
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
 	}
-	$info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+	$info .= "<p class='entity-title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 
 	if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
 			// display the delete link to those allowed to delete
-			$info .= "<div class='entity_metadata'>";
-			$info .= '<span class="entity_edit">' . elgg_view("output/url", array(
+			$info .= "<div class='entity-metadata'>";
+			$info .= '<span class="entity-edit">' . elgg_view("output/url", array(
 																			'href' => "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
 																			'text' => elgg_echo('edit'),
 																		));
@@ -71,7 +71,7 @@ if (elgg_get_context() == "search") {
 	if (($last_time) && ($u)) {
 		$commenter_link = "<a href\"{$u->getURL()}\">$u->name</a>";
 		$text = elgg_echo('groups:lastcomment', array(elgg_view_friendly_time($last_time), $commenter_link));
-		$info .= "<p class='entity_subtext'>$text</p>";
+		$info .= "<p class='entity-subtext'>$text</p>";
 	}
 	//get the user avatar
 	$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 69481e97e..2e8365ec2 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -17,7 +17,7 @@
 	$url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
 	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groupforum:river:posted", array($url_user)) . " ";
-	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	$string .= "</span>";
 	if ($comment) {
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index e595b1fdc..e73064e00 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -16,7 +16,7 @@
 	$string = elgg_echo("groupforum:river:postedtopic", array($url_user)) . ": ";
 	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
 	$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
-	$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
+	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
 	if (isloggedin() && $object->status != "closed") {
 		$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index ef0aaab1b..4774e7a85 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,7 +7,7 @@
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groups:river:create", array($url)) . " ";
 	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-	$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
+	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
 	if (isloggedin()) {
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	}
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 3ba191676..430e95839 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -7,7 +7,7 @@
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groups:river:member", array($url)) . " ";
 	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-	$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($vars['item']->posted);
+	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($vars['item']->posted);
 	$string .= "</span>";
 ?>
 
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index f189d4525..dceac6bbc 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -14,7 +14,7 @@ if ($CONFIG->allow_registration) {
 
 	echo <<< HTML
 <h2>$invite</h2>
-<p class="margin_top">
+<p class="margin-top">
 	<label>
 		$introduction
 		<textarea class="input-textarea" name="emails" ></textarea>
diff --git a/mod/members/index.php b/mod/members/index.php
index a4f21da13..5a62e9d46 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -71,7 +71,7 @@ switch($filter){
 		break;
 }
 
-$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members_list'>".$filter_content."</div>", 'subclass' => 'members'));
+$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
 
 //select the correct canvas area
 $params = array(
diff --git a/mod/members/views/default/members/css.php b/mod/members/views/default/members/css.php
index 9c92398fc..6695537a2 100644
--- a/mod/members/views/default/members/css.php
+++ b/mod/members/views/default/members/css.php
@@ -19,6 +19,6 @@
 	height:auto;
 	margin:4px 0 5px 0;
 }
-#memberssearchform .search_input {
+#memberssearchform .search-input {
 	width:196px;
 }
\ No newline at end of file
diff --git a/mod/members/views/default/members/members_navigation.php b/mod/members/views/default/members/members_navigation.php
index f3d53a954..c866e194d 100644
--- a/mod/members/views/default/members/members_navigation.php
+++ b/mod/members/views/default/members/members_navigation.php
@@ -14,7 +14,7 @@
 	 $url = elgg_get_site_url() . "mod/members/index.php";
 
 ?>
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <ul>
 	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('members:label:newest'); ?></a></li>
 	<li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('members:label:popular'); ?></a></li>
diff --git a/mod/members/views/default/members/search.php b/mod/members/views/default/members/search.php
index 746db67a0..98ec20549 100644
--- a/mod/members/views/default/members/search.php
+++ b/mod/members/views/default/members/search.php
@@ -9,14 +9,14 @@
 
 <h3><?php echo elgg_echo('members:searchtag'); ?></h3>
 <form id="memberssearchform" class="member_tags" action="<?php echo elgg_get_site_url(); ?>mod/members/index.php?" method="get">
-	<input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search-input" />
 	<input type="hidden" name="filter" value="search_tags" />	
 	<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" />
 </form>
 
 <h3><?php echo elgg_echo('members:searchname'); ?></h3>
 <form id="memberssearchform" class="member_name" action="<?php echo elgg_get_site_url(); ?>mod/members/index.php?" method="get">
-	<input type="text" name="tag" value="Members name" onclick="if (this.value=='Members name') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="Members name" onclick="if (this.value=='Members name') { this.value='' }" class="search-input" />
 	<input type="hidden" name="subtype" value="" />
 	<input type="hidden" name="object" value="user" />
 	<input type="hidden" name="filter" value="search" />	
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 2f85a16ac..305a6980f 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -25,7 +25,7 @@ if (isloggedin()) {
 		$("#postit").click(function(){
 
 			//display the ajax loading gif at the start of the function call
-			//$('#loader').html('<img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader.gif" />');
+			//$('#loader').html('<img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax-loader.gif" />');
 			$('#loader').html('<?php echo elgg_view('ajax/loader',array('slashes' => TRUE)); ?>');
 
 			//load the results back into the message board contents and remove the loading gif
diff --git a/mod/messages/index.php b/mod/messages/index.php
index 496a8ee9d..53aeef2aa 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -30,9 +30,9 @@ $messages = elgg_get_entities_from_metadata(array(
 ));
 
 // Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
 $area2 .= elgg_view_title(elgg_echo("messages:inbox"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
 
 // Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from,
 // in this case it is the inbox, this is necessary to ensure the correct display
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 7331a8d52..34dc11692 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -26,9 +26,9 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', '
 
 
 // Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
 $area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
 
 // Set content
 $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
index b186400f8..3e58c2607 100644
--- a/mod/messages/views/default/messages/css.php
+++ b/mod/messages/views/default/messages/css.php
@@ -6,7 +6,7 @@
  */
 ?>
 
-/* messages/new messages icon & counter in elgg_topbar */
+/* messages/new messages icon & counter in elgg-topbar */
 a.privatemessages {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px;
 	padding-left:16px;
@@ -52,7 +52,7 @@ a.privatemessages.new span {
 	border-bottom:1px dotted #cccccc;
 	padding:5px 0 7px 0;
 }
-.message.notread .entity_listing_info p.entity_title a {
+.message.notread .entity-listing-info p.entity-title a {
 	color:#d40005;
 }
 .message_sender {
@@ -77,7 +77,7 @@ a.privatemessages.new span {
 .message .delete-button {
 	margin-top:3px;
 }
-.entity_listing.messages:hover {
+.entity-listing.messages:hover {
 	background-color:white;
 }
 .messages_buttonbank {
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php
index 15eb3ebd0..0b78f4db3 100644
--- a/mod/messages/views/default/messages/forms/reply.php
+++ b/mod/messages/views/default/messages/forms/reply.php
@@ -12,7 +12,7 @@
 	}
 ?>
 
-<form class="margin_top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
+<form class="margin-top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
 	<?php echo elgg_view('action/securitytoken'); ?>
 
     <!-- populate the title space with the orginal message title, inserting re: before it -->						        
diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php
index 43ece8d89..9a83ce103 100644
--- a/mod/messages/views/default/messages/forms/send.php
+++ b/mod/messages/views/default/messages/forms/send.php
@@ -31,10 +31,10 @@ unset($_SESSION['msg_contents']);
 			//get the user object  
 	        $user = get_user($send_to);
 	        
-	        echo "<div class='entity_listing messages clearfix'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+	        echo "<div class='entity-listing messages clearfix'><div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
 	        
 	        //draw it
-			echo "<div class='entity_listing_info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
+			echo "<div class='entity-listing-info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
 			//set the hidden input field to the recipients guid
 	        echo "<input type='hidden' name='send_to' value=\"{$send_to}\" />";	
 			echo "</div></div>";
@@ -42,7 +42,7 @@ unset($_SESSION['msg_contents']);
         } else {
     ?>
         
-        <p class="margin_top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
+        <p class="margin-top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
 	    <select name='send_to'>
 	    <?php 
 			// make the first option blank
@@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']);
         }
     ?>
     
-	<p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
+	<p class="margin-top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
 	<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
 	<?php
 		echo elgg_view("input/longtext", array(
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index 6fc87ac0e..b489cbacd 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -42,9 +42,9 @@ if (isloggedin())
 ?>
 <!-- display the content header block -->
 			<div id="content_header" class="clearfix">
-				<div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
-				<div class="content_header_options">
-					<a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
+				<div class="content-header-title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+				<div class="content-header-options">
+					<a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg-page-contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
 					<?php echo elgg_view("output/confirmlink", array(
 						'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
 						'text' => elgg_echo('delete'),
@@ -55,7 +55,7 @@ if (isloggedin())
 				</div>
 			</div>
 
-				<div class="entity_listing messages clearfix">
+				<div class="entity-listing messages clearfix">
 					<?php
 						// we need a different user icon and name depending on whether the user is reading the message
 						// from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent
@@ -71,13 +71,13 @@ if (isloggedin())
 							$message_owner = elgg_echo('messages:from').": <a href='".elgg_get_site_url()."pg/profile/".$user_object->username."'>".get_entity($vars['entity']->fromId)->name."</a>";
 						}
 					?>
-					<div class="entity_listing_icon"><?php echo $message_icon ?></div>
-					<div class="entity_listing_info"><p><?php echo $message_owner ?></p>
-						<p class="entity_subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
+					<div class="entity-listing-icon"><?php echo $message_icon ?></div>
+					<div class="entity-listing-info"><p><?php echo $message_owner ?></p>
+						<p class="entity-subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
 					</div>
 				</div>
 
-				<div class="messagebody margin_top clearfix">
+				<div class="messagebody margin-top clearfix">
 					<?php
 						// if the message is a reply, display the message the reply was for
 						// @todo I need to figure out how to get the description out using -> (anyone?)
@@ -90,9 +90,9 @@ if (isloggedin())
 				</div>
 
 				<!-- reply form -->
-				<div id="message_reply_form" class="hidden margin_top">
+				<div id="message_reply_form" class="hidden margin-top">
 					<h2><?php echo elgg_echo('messages:answer'); ?></h2>
-					<form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form">
+					<form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin-top" id="messages_send_form">
 						<?php echo elgg_view('input/securitytoken'); ?>
 						<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
 						<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
index 76fa4a00c..cc0b5ec3a 100644
--- a/mod/messages/views/default/messages/view.php
+++ b/mod/messages/views/default/messages/view.php
@@ -34,9 +34,9 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 		            }
 				    // get the icon of the user who owns the message
 				    $from = get_entity($message->fromId);
-					echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
+					echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
 					// message block (message sender, message subject, delete checkbox)
-					echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+					echo "<div class='entity-listing-info'><div class='message_sender'>".$from->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
 					// display message subject
 					echo "<div class='message_subject'>";
 					// display delete button
@@ -45,7 +45,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm'),
 					)) . "</span>";
-					echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
+					echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
 					echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>";
 				    echo "</div></div></div>"; // close the message container
 				}//end of hiddenFrom if statement
@@ -70,8 +70,8 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 					$user = get_entity($message->toId);
 					echo "<div class='message sent clearfix'>";
 					//get the icon for the user the message was sent to
-					echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
-					echo "<div class='entity_listing_info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+					echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+					echo "<div class='entity-listing-info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
 					// display message subject
 					echo "<div class='message_subject'>";
 					//display the link to 'delete'
@@ -80,7 +80,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm'),
 					)) . "</div>";
-					echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
+					echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
 					echo "<a href=\"{$message->getURL()}?type=sent\">" . $message->title . "</a></p>";
 					echo "</div></div></div>"; // close the message container
 				}//close hiddeTo if statement
@@ -99,7 +99,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 			$newoffset = $offset + $limit;
 			$nexturl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
 
-			$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+			$nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
 		}
 
 		if ($offset > 0) {
@@ -108,7 +108,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 
 			$prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
 
-			$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+			$nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
 		}
 
 
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index cea806f2f..eb9e4778e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -17,7 +17,7 @@ function notifications_plugin_init() {
 	elgg_register_event_handler('pagesetup', 'system', 'notifications_plugin_pagesetup');
 
 	// Unset the default notification settings
-	elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
+	elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user-settings_save');
 	elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
 
 	// update notifications based on relationships changing
@@ -26,7 +26,7 @@ function notifications_plugin_init() {
 
 	// update notifications when new friend or access collection membership
 	elgg_register_event_handler('create', 'friend', 'notifications_update_friend_notify');
-	elgg_register_plugin_hook_handler('access:collections:add_user', 'collection', 'notifications_update_collection_notify');
+	elgg_register_plugin_hook_handler('access:collections:add-user', 'collection', 'notifications_update_collection_notify');
 }
 
 /**
@@ -161,7 +161,7 @@ function notifications_update_collection_notify($event, $object_type, $returnval
 		}
 		if (in_array($collection_id, $collections_preferences)) {
 			// notifications are on for this collection so we add/remove
-			if ($event == 'access:collections:add_user') {
+			if ($event == 'access:collections:add-user') {
 				add_entity_relationship($user->guid, "notify$method", $member_guid);
 			} elseif ($event == 'access:collections:remove_user') {
 				// removing someone from an access collection is not a guarantee
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 713dff765..8cca13689 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -17,7 +17,7 @@
 <h3>
 	<?php echo elgg_echo('notifications:subscriptions:friends:title'); ?>
 </h3>
-<p class="margin_none">
+<p class="margin-none">
 	<?php echo elgg_echo('notifications:subscriptions:friends:description'); ?>
 </p>
 <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 6c18f6fca..449f908a7 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -14,7 +14,7 @@
 	
 // Display a description
 ?>
-<div class="user_settings notifications">
+<div class="user-settings notifications">
 <?php
 
 
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 7cc393442..0576bc7b9 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -96,7 +96,7 @@ if (!$callback) {
 			
 ?>
 
-<div class="friends_picker">
+<div class="friends-picker">
 
 <?php
 
@@ -106,7 +106,7 @@ if (!$callback) {
 	
 ?>
 
-	<div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
+	<div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
 
 <?php
 	
@@ -149,9 +149,9 @@ if (!isset($vars['replacement'])) {
 		
 ?>
 
-	<div class="friends_picker_wrapper">
-	<div id="friends_picker<?php echo $friendspicker; ?>">
-		<div class="friends_picker_container">
+	<div class="friends-picker-wrapper">
+	<div id="friends-picker<?php echo $friendspicker; ?>">
+		<div class="friends-picker-container">
 <?php
 
 	// Initialise letters
@@ -289,7 +289,7 @@ if (!isset($vars['replacement'])) {
 
 <script type="text/javascript">
 		// initialise picker
-		$("div#friends_picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+		$("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
 </script>
 <script type="text/javascript">
 	$(document).ready(function () {
@@ -300,7 +300,7 @@ if (!isset($vars['replacement'])) {
 		foreach($activeletters as $letter) {
 			$tab = elgg_strpos($chararray, $letter) + 1;
 ?>
-	$("div#friends_picker_navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+	$("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
 <?php
 		}
 	}
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index b89350acb..bf75f5931 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -20,7 +20,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups'));
 ?>
 
-<div class="user_settings margin_top">
+<div class="user-settings margin-top">
 
 	<?php
 		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index f85e4d42e..221ca0e21 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -13,7 +13,7 @@ $url = $object->getURL();
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
 $string = elgg_echo("pages:river:created", array($url)) . " ";
-$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "<div class=\"river_content_display\">";
 $string .= elgg_get_excerpt($contents, 200);
diff --git a/mod/profile/views/default/profile/commentwall/commentwall.php b/mod/profile/views/default/profile/commentwall/commentwall.php
index a45c3adde..56670dcf0 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall.php
@@ -12,7 +12,7 @@ if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
 		echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content));
 	}			
 } else {
-	echo "<p class='margin_top'>" . elgg_echo("profile:commentwall:none") . "</p>";
+	echo "<p class='margin-top'>" . elgg_echo("profile:commentwall:none") . "</p>";
 }
 //close the wrapper div
 echo "</div>";
\ No newline at end of file
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
index a7a7ca14d..a0785b565 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php
@@ -3,19 +3,19 @@
 * Elgg Message board individual item display page
  */
 ?>
-<div class="entity_listing clearfix">
+<div class="entity-listing clearfix">
     <!-- display the user icon of the user that posted the message -->
-    <div class="entity_listing_icon">	        
+    <div class="entity-listing-icon">	        
         <?php
             echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
         ?>
     </div>
     
-    <div class="entity_listing_info">
+    <div class="entity-listing-info">
 	<?php
         // if the user looking at the comment can edit, show the delete link
 	    if ($vars['annotation']->canEdit()) {
-			       echo "<div class='entity_metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
+			       echo "<div class='entity-metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
 							'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
 								'text' => elgg_echo('delete'),
 								'confirm' => elgg_echo('deleteconfirm'),
@@ -23,7 +23,7 @@
 	    } //end of can edit if statement
 	?>
 	    <!-- display the user's name who posted and the date/time -->
-	    <p class="entity_subtext">
+	    <p class="entity-subtext">
 	        <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
 	    </p>	
 		<!-- output the actual comment -->
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index d1941bbc8..537d9261e 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -17,22 +17,22 @@
 	width:230px;
 	float:left;
 }
-.elgg_horizontal_tabbed_nav.profile {
+.elgg-horizontal-tabbed-nav.profile {
 	margin-top:0px;
 	margin-bottom:25px;
 	position:relative;
 }
-.elgg_horizontal_tabbed_nav.profile .profile_name {
+.elgg-horizontal-tabbed-nav.profile .profile_name {
 	display:block;
 	width:265px;
 	position:absolute;
 }
-.elgg_horizontal_tabbed_nav.profile .profile_name h2 {
+.elgg-horizontal-tabbed-nav.profile .profile_name h2 {
 	margin:0;
 	padding:0;
 	border:none;
 }
-.elgg_horizontal_tabbed_nav.profile ul {
+.elgg-horizontal-tabbed-nav.profile ul {
 	margin-left:260px;
 }
 
@@ -89,7 +89,7 @@ img.medium {
 	padding:15px;
 	min-height:270px;
 }
-#elgg_sidebar #owner_block {
+#elgg-sidebar #owner_block {
 	background-color: white;
 	-webkit-border-radius: 8px; 
 	-moz-border-radius: 8px;
@@ -110,7 +110,7 @@ img.medium {
 #owner_block .owner_block_contents {
 	margin-left: 50px;
 }
-#elgg_sidebar #owner_block .owner_block_contents {
+#elgg-sidebar #owner_block .owner_block_contents {
 	margin-left: 34px;
 }
 #owner_block .owner_block_contents h3 {
@@ -249,7 +249,7 @@ img.medium {
 /* ***************************************
 	friends panel within profile
 *************************************** */
-#profile_content .entity_listing .entity_listing_info {
+#profile_content .entity-listing .entity-listing-info {
 	width:664px;
 }
 
@@ -351,10 +351,10 @@ p.visit_twitter a {
 	-moz-border-radius: 6px;
 }
 /* banned user in friends lists */
-.entity_listing_info p.entity_title.user.banned {
+.entity-listing-info p.entity-title.user.banned {
 	text-decoration: line-through;
 }
-.entity_listing_info p.entity_title.user.banned a {
+.entity-listing-info p.entity-title.user.banned a {
 	color:red;
 }
 
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
index 4ca723385..2e3ec24a4 100644
--- a/mod/profile/views/default/profile/edit.php
+++ b/mod/profile/views/default/profile/edit.php
@@ -8,7 +8,7 @@
  * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now 
  */
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin-top">
 <?php echo elgg_view('input/securitytoken') ?>
 
 	<p><label>
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index 4993e1c7f..7d701af11 100644
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -25,5 +25,5 @@ $formbody = <<< END
 		$submit_control</p>
 END;
 
-echo "<p class='margin_top'>" . elgg_echo('profile:explainchangefields') . "</p>";
+echo "<p class='margin-top'>" . elgg_echo('profile:explainchangefields') . "</p>";
 echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault'));
diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php
index 4c093cb22..29ce7f138 100644
--- a/mod/profile/views/default/profile/editdefaultprofileitems.php
+++ b/mod/profile/views/default/profile/editdefaultprofileitems.php
@@ -51,7 +51,7 @@ END;
 		//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 		$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/delete?id={$item->shortname}");
 		echo "<li id=\"{$item->shortname}\"><div class='delete-button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>";
-		echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag_handle.png'/>";
+		echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag-handle.png'/>";
 		echo "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>:  [".elgg_echo($item->type)."]";
 		echo "</li>";
 
diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
index 9e1987d55..9eeaecb4a 100644
--- a/mod/profile/views/default/profile/editicon.php
+++ b/mod/profile/views/default/profile/editicon.php
@@ -15,7 +15,7 @@ $currentuser = get_loggedin_user();
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js"></script>
 
-<p class="margin_top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
+<p class="margin-top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
 
 <div id="current_user_avatar">
 
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
index 96b3d24d5..0622264b8 100644
--- a/mod/profile/views/default/profile/listing.php
+++ b/mod/profile/views/default/profile/listing.php
@@ -29,15 +29,15 @@ if ($rel_type) {
 }
 
 if (!$banned) {
-	$info .= "<p class='entity_title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
+	$info .= "<p class='entity-title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
 	$location = $vars['entity']->location;
 	if (!empty($location)) {
-		$info .= "<p class='entity_subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
+		$info .= "<p class='entity-subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
 	}
 	//create a view that a status plugin could extend - in the default case, this is the wire
 	$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
 }else{
-	$info .= "<p class='entity_title user banned'>";
+	$info .= "<p class='entity-title user banned'>";
 	if (isadminloggedin())
 		$info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
 	$info .= $vars['entity']->name;
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php
index a27cf789d..ca0873ebd 100755
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/profile_navigation.php
@@ -45,7 +45,7 @@ switch($section){
 		break;
 }
 ?>
-<div class="elgg_horizontal_tabbed_nav profile">
+<div class="elgg-horizontal-tabbed-nav profile">
 <div class="profile_name"><h2><?php echo $user->name; ?></h2></div>
 <ul>
 	<li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li>
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php
index 9e617573b..d7b15dab5 100644
--- a/mod/profile/views/default/river/user/default/profileiconupdate.php
+++ b/mod/profile/views/default/river/user/default/profileiconupdate.php
@@ -3,6 +3,6 @@
 	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
 
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+	$string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
 
 	echo $string;
\ No newline at end of file
diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php
index 156aa8b1b..155b25fa9 100644
--- a/mod/profile/views/default/river/user/default/profileupdate.php
+++ b/mod/profile/views/default/river/user/default/profileupdate.php
@@ -3,7 +3,7 @@
 	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
 
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+	$string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
 
 ?>
 
diff --git a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
index 0cf8643a3..3f79d500a 100644
--- a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
+++ b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
@@ -9,7 +9,7 @@ $title = elgg_view_title(elgg_echo('reportedcontent'));
 
 $list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
 if (!$list) {
-	$list = '<p class="margin_top">' . elgg_echo('reportedcontent:none') . '</p>';
+	$list = '<p class="margin-top">' . elgg_echo('reportedcontent:none') . '</p>';
 }
 
 $body = <<<__HTML
diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php
index b22bc05f6..e70afacf8 100644
--- a/mod/reportedcontent/views/default/reportedcontent/form.php
+++ b/mod/reportedcontent/views/default/reportedcontent/form.php
@@ -18,7 +18,7 @@ $shares = array();
 $owner = get_loggedin_user();
 
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="margin-top">
 <?php echo elgg_view('input/securitytoken'); ?>
 
 	<p>
diff --git a/mod/riverdashboard/endpoint/get_comments.php b/mod/riverdashboard/endpoint/get_comments.php
index 22d89bcfd..f130cfd3c 100644
--- a/mod/riverdashboard/endpoint/get_comments.php
+++ b/mod/riverdashboard/endpoint/get_comments.php
@@ -25,16 +25,16 @@ foreach ($comments as $comment) {
 	$comment_owner_url = $comment_owner->getURL();
 
 	//display comment
-	echo "<div class='river_comment clearfix'>";
-	echo "<span class='river_comment_owner_icon'>";
+	echo "<div class='river-comment clearfix'>";
+	echo "<span class='river-comment-owner-icon'>";
 	echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
 	echo "</span>";
 
 	//truncate comment to 150 characters and strip tags
 	$contents = elgg_get_excerpt($comment->value, 150);
 
-	echo "<div class='river_comment_contents'>";
+	echo "<div class='river-comment-contents'>";
 	echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="twitter_anywhere">' . parse_urls($contents) . '</span>';
-	echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
+	echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
 	echo "</div></div>";
 }
\ No newline at end of file
diff --git a/mod/riverdashboard/endpoint/ping.php b/mod/riverdashboard/endpoint/ping.php
index 5dd3bff5e..239582bf2 100644
--- a/mod/riverdashboard/endpoint/ping.php
+++ b/mod/riverdashboard/endpoint/ping.php
@@ -17,8 +17,8 @@ $last_reload = time() - $seconds_passed;
 
 // This entire system is driven by the river table.
 // There is no core interface to simply grab the number of entries in the table.
-// In order for something to count as an update, you must put a call to add_river_item().
-// @todo Remove this when elgg_get_river_items() supports 1.7-style API and count => TRUE and not group by object_guid
+// In order for something to count as an update, you must put a call to add_river-item().
+// @todo Remove this when elgg_get_river-items() supports 1.7-style API and count => TRUE and not group by object_guid
 
 // river table does not have columns expected by get_access_sql_suffix so we modify its output
 $access = str_replace("and enabled='yes'", '', str_replace('owner_guid', 'subject_guid', get_access_sql_suffix_new('r', 'e')));
@@ -34,7 +34,7 @@ if ($d = get_data($q)) {
 
 if ($all_activity > 0) {
 	$s = ($all_activity == 1) ? '' : 's';
-	echo "<a href='' onClick=\"window.location.reload();\" class='update_link'>$all_activity update$s!</a>";
+	echo "<a href='' onClick=\"window.location.reload();\" class='update-link'>$all_activity update$s!</a>";
 ?>
 	<script type="text/javascript">
 		$(document).ready(function(){
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 8d650e1f5..8d0d1d657 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -41,7 +41,7 @@ switch($orient) {
 
 $title .= elgg_view_title($title_wording);
 $extend = elgg_view("activity/extend");
-$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, TRUE, FALSE);
+$river = elgg_view_river-items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, TRUE, FALSE);
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true', 'replaced=88,334', $river);
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index 8469448a0..ae193ce4c 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -38,7 +38,7 @@ function riverdashboard_page_handler($page){
  * @param ElggEntity $entity The entity to comment on
  * @return string|false The HTML (etc) for the comment form, or false on failure
  */
-function elgg_make_river_comment($entity){
+function elgg_make_river-comment($entity){
 	if (!($entity instanceof ElggEntity)) {
 		return FALSE;
 	} else {
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index a0f547e45..fdd5b24df 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -5,7 +5,7 @@ if (isset($vars['items']) && is_array($vars['items'])) {
 	$i = 0;
 	if (!empty($vars['items'])) {
 		foreach($vars['items'] as $item) {
-			echo elgg_view_river_item($item);
+			echo elgg_view_river-item($item);
 			$i++;
 			if ($i >= $vars['limit']) {
 				break;
@@ -29,7 +29,7 @@ if ($vars['pagination'] !== false) {
 			$nexturl=$baseurl . '?' . $urladdition;
 		}
 
-		$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+		$nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
 	}
 
 	if ($vars['offset'] > 0) {
@@ -44,7 +44,7 @@ if ($vars['pagination'] !== false) {
 			$prevurl=$baseurl . '?' . $urladdition;
 		}
 
-		$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+		$nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
 	}
 
 	if (!empty($nav)) {
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 0413775d6..8e93b25b5 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -41,12 +41,12 @@ if ($comment_count < 3) {
 }
 
 ?>
-<div class="river_item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
-	<span class="river_item_useravatar">
+<div class="river-item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
+	<span class="river-item-useravatar">
 		<?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
 	</span>
 
-	<div class="river_item_contents clearfix">
+	<div class="river-item-contents clearfix">
 <?php
 
 // body contents, generated by the river view in each plugin
@@ -56,30 +56,30 @@ echo $vars['body'];
 if ($comments){
 	$counter = 0;
 
-	echo "<div class='river_comments_tabs clearfix'>";
-	echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
+	echo "<div class='river-comments-tabs clearfix'>";
+	echo "<a class='river-more-comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
 
 	if ($likes_count != 0) {
 		echo elgg_view('likes/forms/display', array('entity' => $object));
 	}
 
-	echo "</div>"; // close river_comments_tabs
+	echo "</div>"; // close river-comments-tabs
 
-	echo "<div class='river_comments'>";
+	echo "<div class='river-comments'>";
 
 	if ($likes_count != 0) {
 		//show the users who liked the object
 		// this is loaded via ajax to avoid pounding the server with avatar requests.
-		echo "<div class='likes_list hidden'></div>";
+		echo "<div class='likes-list hidden'></div>";
 	}
 
 	echo "<div class=\"comments_container\">";
 	// display appropriate comment link
 	if ($more_comments_count > 0) {
-		echo "<a class=\"river_more_comments show_more_button link\">" .
+		echo "<a class=\"river-more-comments show_more_button link\">" .
 		elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . '</a>';
 
-		echo "<a style=\"display: none\" class=\"river_more_comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
+		echo "<a style=\"display: none\" class=\"river-more-comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
 	}
 	echo "<div class=\"comments_list\">";
 	foreach ($comments as $comment) {
@@ -95,27 +95,27 @@ if ($comments){
 			$alt = 'penultimate';
 		}
 		//display comment
-		echo "<div class='river_comment $alt clearfix'>";
-		echo "<span class='river_comment_owner_icon'>";
+		echo "<div class='river-comment $alt clearfix'>";
+		echo "<span class='river-comment-owner-icon'>";
 		echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
 		echo "</span>";
 
 		//truncate comment to 150 characters and strip tags
 		$contents = elgg_get_excerpt($comment->value, 150);
 
-		echo "<div class='river_comment_contents'>";
+		echo "<div class='river-comment-contents'>";
 		echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
-		echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
+		echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
 		echo "</div></div>";
 		$counter++;
 	}
 
-	// close comments_list, comments_container and river_comments
-	echo '</div></div>' . elgg_make_river_comment($object) . '</div>';
+	// close comments_list, comments_container and river-comments
+	echo '</div></div>' . elgg_make_river-comment($object) . '</div>';
 } else {
 	// tab bar nav - for users that liked object
 	if ($vars['item']->type != 'user' && $likes_count != 0) {
-		echo "<div class='river_comments_tabs clearfix'>";
+		echo "<div class='river-comments-tabs clearfix'>";
 	}
 
 	if ($likes_count != 0) {
@@ -123,15 +123,15 @@ if ($comments){
 	}
 
 	if ($vars['item']->type != 'user' && $likes_count != 0) {
-		echo "</div>"; // close river_comments_tabs
+		echo "</div>"; // close river-comments-tabs
 	}
 
 	if ($vars['item']->type != 'user') {
-		echo "<div class='river_comments'>";
+		echo "<div class='river-comments'>";
 	}
 	if ($likes_count != 0) {
 		//show the users who liked the object
-		echo "<div class='likes_list hidden'>";
+		echo "<div class='likes-list hidden'>";
 		echo list_annotations($object->getGUID(), 'likes', 99);
 		echo "</div>";
 	}
@@ -139,7 +139,7 @@ if ($comments){
 	// if there are no comments to display
 	// and this is not a user - include the inline comment form
 	if ($vars['item']->type != 'user') {
-		echo elgg_make_river_comment($object);
+		echo elgg_make_river-comment($object);
 	}
 	if ($vars['item']->type != 'user') {
 		echo "</div>";
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
index 60568642a..58fe938f4 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -6,13 +6,13 @@
  * @package Elgg

  */

 ?>

-<div class="river_item riverdashboard">

-	<span class="river_item_useravatar">

+<div class="river-item riverdashboard">

+	<span class="river-item-useravatar">

 <?php

 echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));

 ?>

 	</span>

-	<div class="river_item_contents clearfix">

+	<div class="river-item-contents clearfix">

 <?php

 echo $vars['body'];

 ?>

diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
index 9f0164b43..09a593622 100644
--- a/mod/riverdashboard/views/default/riverdashboard/container.php
+++ b/mod/riverdashboard/views/default/riverdashboard/container.php
@@ -30,7 +30,7 @@ function activityUpdateChecker(interval) {
 			'data': {'seconds_passed': this.seconds_passed},
 			'success': function(data) {
 				if (data) {
-					$('#riverdashboard_updates').html(data).slideDown();
+					$('#riverdashboard-updates').html(data).slideDown();
 					// could crank down the interval here.
 					// if we change the message to simply "New Posts!"
 					// we could stop the polling altogether.
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index a09a32712..18ba7c0dc 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -4,10 +4,10 @@
  *
  */
 ?>
-#riverdashboard_updates {
+#riverdashboard-updates {
 	border-bottom:1px solid #cccccc;
 }
-#riverdashboard_updates a.update_link {
+#riverdashboard-updates a.update-link {
 	display: inline-table;
 	color:white;
 	font-weight: bold;
@@ -18,47 +18,47 @@
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 }
-#riverdashboard_updates a.update_link:hover {
+#riverdashboard-updates a.update-link:hover {
 	background: #4690D6 url("<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px;
 	color:white;
 	text-decoration: none;
 }
-.riverdashboard_filtermenu {
+.riverdashboard-filtermenu {
 	margin:10px 0 10px 0;
 	float:right;
 }
 
 /* RIVER ENTRY */
-.river_item {
+.river-item {
 	border-bottom:1px solid #cccccc;
 	padding:7px 0 7px 0;
 }
-.river_item p {
+.river-item p {
 	margin:0;
 }
-.river_item .entity_subtext {
+.river-item .entity-subtext {
 	display: block;
 	line-height: 1.4em;
 }
-.river_item_useravatar {
+.river-item-useravatar {
 	float:left;
 	margin-top:3px;
 	margin-left:1px;
 }
-.river_item_contents {
+.river-item-contents {
 	margin-left:55px;
 }
-.river_item_contents a {
+.river-item-contents a {
 	font-weight: bold;
 }
-.river_content_display {
+.river-content-display {
 	border-left:1px solid #DDDDDD;
 	font-size:85%;
 	line-height:1.5em;
 	margin:8px 0 5px 0;
 	padding-left:5px;
 }
-.following_icon {
+.following-icon {
 	width:20px;
 	height:25px;
 	margin:0 2px 0 2px;
@@ -66,11 +66,11 @@
 }
 
 /* LATEST COMMENTS IN RIVER */
-.river_comments_tabs {
+.river-comments-tabs {
 	max-height: 19px;
 	overflow:hidden;
 }
-.river_comments {
+.river-comments {
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 	-moz-border-radius-topleft:5px;
@@ -81,65 +81,65 @@
 	-webkit-border-bottom-left-radius:5px;
 	background-color: #eeeeee;
 }
-.river_comment {
+.river-comment {
 	padding:3px;
 	border-bottom:1px solid white;
 }
-.river_comment.penultimate {
+.river-comment.penultimate {
 
 }
-.river_comment.latest {
+.river-comment.latest {
 
 }
 /* hidden inline comment form */
-.river_comment_form.hidden {
+.river-comment_form.hidden {
 	padding:5px;
 	height:26px;
 }
-.river_comment_form.hidden .input-text {
+.river-comment_form.hidden .input-text {
 	width:560px;
 	padding:3px;
 }
-#profile_content .river_comment_form.hidden .input-text { /* when activity is displayed on profile page */
+#profile-content .river-comment_form.hidden .input-text { /* when activity is displayed on profile page */
 	width:535px;
 }
-.river_comment_form.hidden .submit-button {
+.river-comment_form.hidden .submit-button {
 	margin:0 0 0 10px;
 	float:right;
 }
-.river_link_divider {
+.river-link-divider {
 	color:#999999;
 	font-style: normal;
 }
-.river_item_contents .river_comment_form_button,
-.river_item_contents .river_user_like_button {
+.river-item-contents .river-comment-form-button,
+.river-item-contents .river_user-like-button {
 	font-weight:normal;
 	font-style: normal;
 }
-.river_item_contents .river_comment_form_button {
+.river-item-contents .river-comment-form-button {
 	margin-left: 7px;
 }
 /* hidden list of users that liked item */
-.river_item .elgg_likes_user {
+.river-item .elgg-likes-user {
 	border-bottom:1px solid white;
 	padding:3px;
 }
-.river_item .elgg_likes_user .entity_listing_icon {
+.river-item .elgg-likes-user .entity-listing-icon {
 	margin:3px 0 4px 2px;
 }
-.river_item .elgg_likes_user .entity_listing_info {
+.river-item .elgg-likes-user .entity-listing-info {
 	width:635px;
 }
-#profile_content .river_item .elgg_likes_user .entity_listing_info { /* when likes is displayed on profile page activity stream */
+#profile-content .river-item .elgg-likes-user .entity-listing-info { /* when likes is displayed on profile page activity stream */
 	width:600px;
 }
-.river_item .elgg_likes_user .entity_metadata {
+.river-item .elgg-likes-user .entity-metadata {
 	margin-top:3px;
 }
-.river_item p.elgg_likes_owner {
+.river-item p.elgg-likes-owner {
 	padding-top:0;
 }
-.river_item a.river_more_comments {
+.river-item a.river-more-comments {
 	display:block;
 	float:right;
 	padding:1px 7px 1px 7px;
@@ -154,17 +154,17 @@
 	-webkit-border-top-left-radius:4px;
 	-webkit-border-top-right-radius:4px;
 }
-.river_item a.river_more_comments.off {
+.river-item a.river-more-comments.off {
 	background-color: white;
 }
-.river_item .river_comment_owner_icon {
+.river-item .river-comment-owner-icon {
 	float:left;
 	margin:3px 8px 4px 2px;
 }
-.river_item .river_comment_contents {
+.river-item .river-comment-contents {
 	margin-left:34px;
 }
-a.river_more_comments {
+a.river-more-comments {
 	float:right;
 	font-size:85%;
 	padding-right:7px;
diff --git a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
index d24a8ffc2..2a76f0c68 100644
--- a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
+++ b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
@@ -18,7 +18,7 @@ if ($owner && !is_numeric($owner)) {
 	}
 }
 
-$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
+$river = elgg_view_river-items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334', $river);
diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php
index 4eec41149..09b1113d8 100644
--- a/mod/riverdashboard/views/default/riverdashboard/js.php
+++ b/mod/riverdashboard/views/default/riverdashboard/js.php
@@ -1,16 +1,16 @@
 <script type="text/javascript">
 	$(document).ready(function() {
-		$('.river_comment_form_button').click(function() {
-			elgg_slide_toggle(this, '.river_item', '.river_comment_form');
+		$('.river-comment-form-button').click(function() {
+			elgg_slide_toggle(this, '.river-item', '.river-comment_form');
 		});
 
 		$('.likes_user_list_button').click(function() {
-			var myParent = $(this).closest('.river_item');
-			var likesList = myParent.find('.likes_list');
+			var myParent = $(this).closest('.river-item');
+			var likesList = myParent.find('.likes-list');
 
 			if (likesList.css('display') == 'none') {
 				// pull in likes via ajax to save on loading many avatars
-				var riverItem = $(this).closest('.river_item');
+				var riverItem = $(this).closest('.river-item');
 				var guid = riverItem.attr('id').replace('river_entity_', '');
 
 				var params = {
@@ -24,33 +24,33 @@
 					myParent.find('.show_comments_button').addClass('off');
 					myParent.find('.likes_user_list_button').removeClass('off');
 					// show users that liked object
-					elgg_slide_toggle(this, '.river_item', '.likes_list');
+					elgg_slide_toggle(this, '.river-item', '.likes-list');
 				});
 			}
 		});
 
 		$('.show_comments_button').click(function() {
-			var myParent = $(this).closest('.river_item');
+			var myParent = $(this).closest('.river-item');
 			if (myParent.find('.comments_container').css('display') == 'none') {
 				// hide likes
-				myParent.find('.likes_list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
+				myParent.find('.likes-list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
 				// change selected tab
 				myParent.find('.show_comments_button').removeClass('off');
 				myParent.find('.likes_user_list_button').addClass('off');
 				// show users that liked object
-				elgg_slide_toggle(this, '.river_item', '.comments_container');
+				elgg_slide_toggle(this, '.river-item', '.comments_container');
 			}
 		});
 
 		// grab more comments
-		$('.river_more_comments.show_more_button').click(function() {
+		$('.river-more-comments.show_more_button').click(function() {
 			var showLess = $(this).next('.show_less_button');
 			var showMore = $(this);
-			var riverItem = $(this).closest('.river_item');
+			var riverItem = $(this).closest('.river-item');
 
 			var guid = riverItem.attr('id').replace('river_entity_', '');
 			var commentsList = riverItem.find('.comments_list');
-			var numComments = riverItem.find('.river_comment').length;
+			var numComments = riverItem.find('.river-comment').length;
 
 			var params = {
 				'entity_guid': guid,
@@ -67,12 +67,12 @@
 		});
 
 		// hide more comments
-		$('.river_more_comments.show_less_button').click(function() {
+		$('.river-more-comments.show_less_button').click(function() {
 			var showLess = $(this);
 			var showMore = $(this).prev('.show_more_button');
-			var riverItem = $(this).closest('.river_item');
+			var riverItem = $(this).closest('.river-item');
 			// want to keep the latest 3 comments
-			var comments = riverItem.find('.river_comment')
+			var comments = riverItem.find('.river-comment')
 			comments = $.makeArray(comments).reverse();
 			//reverse().splice(0, 3);
 
@@ -92,5 +92,5 @@
 	});
 
 	// re-add avatar menus for new avatars
-	//setup_avatar_menu($('.river_item_list'));
+	//setup_avatar_menu($('.river-item_list'));
 </script>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 820ebb5ae..cae3d7bcd 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -32,7 +32,7 @@ switch($vars['orient']) {
 		break;
 }
 ?>
-<div class="riverdashboard_filtermenu"> 
+<div class="riverdashboard-filtermenu"> 
 	<?php
 		$location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
 		$current = get_input('subtype');
@@ -54,4 +54,4 @@ switch($vars['orient']) {
 	?>
 	<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
 </div>
-<div id="riverdashboard_updates" class="clearfix"></div>
+<div id="riverdashboard-updates" class="clearfix"></div>
diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
index 03bd91d10..d6037557d 100644
--- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
+++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
@@ -5,7 +5,7 @@
  */
 
 if (isset($vars['entity']) && isloggedin()) {
-	$form_body = "<div class='river_comment_form hidden'>";
+	$form_body = "<div class='river-comment_form hidden'>";
 	$form_body .= elgg_view('input/text',array(
 							'internalname' => 'generic_comment',
 							'value' => 'Add a comment...',
diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php
index 0cd760664..6e267fe7a 100644
--- a/mod/search/views/default/search/comments/entity.php
+++ b/mod/search/views/default/search/comments/entity.php
@@ -48,8 +48,8 @@ echo <<<___END
 	<div class="search_listing clearfix">
 		<div class="search_listing_icon">$icon</div>
 		<div class="search_listing_info">
-			<p class="entity_title">$title</p>$description
-			<p class="entity_subtext">$time</p>
+			<p class="entity-title">$title</p>$description
+			<p class="entity-subtext">$time</p>
 		</div>
 	</div>
 ___END;
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index e008da10d..d93a603eb 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -56,15 +56,15 @@ if (!$time) {
 	<div class="search_listing clearfix">
 	<div class="search_listing_icon"><?php echo $icon; ?></div>
 		<div class="search_listing_info">
-			<p class="entity_title"><?php echo $title; ?></p>
+			<p class="entity-title"><?php echo $title; ?></p>
 			<?php echo $description; ?>
 <?php 
 if ($extra_info) {
 ?>
-			<p class="entity_subtext"><?php echo $extra_info; ?></p>
+			<p class="entity-subtext"><?php echo $extra_info; ?></p>
 <?php
 }
 ?>
-			<p class="entity_subtext"><?php echo $time; ?></p>
+			<p class="entity-subtext"><?php echo $time; ?></p>
 		</div>
 	</div>
diff --git a/mod/search/views/default/search/search_box.php b/mod/search/views/default/search/search_box.php
index df66d11f5..b42319520 100644
--- a/mod/search/views/default/search/search_box.php
+++ b/mod/search/views/default/search/search_box.php
@@ -12,11 +12,11 @@ $value = stripslashes($value);
 
 ?>
 
-<div id="elgg_search">
+<div id="elgg-search">
 	<form id="searchform" action="<?php echo elgg_get_site_url(); ?>pg/search/" method="get">
 		<fieldset>
-		<input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" />
-		<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
+		<input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search-input" />
+		<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
 		</fieldset>
 	</form>
 </div>
\ No newline at end of file
diff --git a/mod/sitepages/views/default/canvas/layouts/frontpage.php b/mod/sitepages/views/default/canvas/layouts/frontpage.php
index 00e978492..bef8b8396 100644
--- a/mod/sitepages/views/default/canvas/layouts/frontpage.php
+++ b/mod/sitepages/views/default/canvas/layouts/frontpage.php
@@ -1,15 +1,15 @@
 <?php

 

 ?>

-<div id="elgg_content" class="clearfix">

-	<div id="elgg_sidebar" class="frontpage">

+<div id="elgg-content" class="clearfix">

+	<div id="elgg-sidebar" class="frontpage">

 		<?php 

 			if (isset($vars['area2'])) echo $vars['area2']; 

 			if (isset($vars['area3'])) echo $vars['area3'];	

 		?>

 	</div>

 	

-	<div id="elgg_page_contents" class="frontpage clearfix">

+	<div id="elgg-page-contents" class="frontpage clearfix">

 		<?php 

 			if (isset($vars['area1'])) echo $vars['area1'];

 		?>

diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php
index 91fe9d9e3..3e54172f2 100644
--- a/mod/sitepages/views/default/sitepages/css.php
+++ b/mod/sitepages/views/default/sitepages/css.php
@@ -3,18 +3,18 @@
 * Sitepages CSS

 */

 ?>

-#elgg_sidebar.frontpage {

+#elgg-sidebar.frontpage {

 	margin-top:0;

 }

-#elgg_sidebar.frontpage .sitepages_sidebar_object {

+#elgg-sidebar.frontpage .sitepages_sidebar_object {

 	margin-bottom: 30px;

 }

-#elgg_sidebar.frontpage .sitepages_sidebar_object h3 {

+#elgg-sidebar.frontpage .sitepages_sidebar_object h3 {

 	margin-top:12px;

 }

-#elgg_page_contents.frontpage .sitepages_welcome {

+#elgg-page-contents.frontpage .sitepages_welcome {

 	margin-bottom: 20px;

 }

-#elgg_page_contents.frontpage .sitepages_message {

+#elgg-page-contents.frontpage .sitepages_message {

 	margin-top: 10px;

 }
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php
index 73a010332..9ca33064e 100644
--- a/mod/sitepages/views/default/sitepages/members.php
+++ b/mod/sitepages/views/default/sitepages/members.php
@@ -5,7 +5,7 @@
 <h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>

 <?php 

 	foreach($newest_members as $mem){

-		echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";

+		echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";

 	}

 ?>

 </div>
\ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php
index ec145cc67..6759e3570 100644
--- a/mod/sitepages/views/default/sitepages/menu.php
+++ b/mod/sitepages/views/default/sitepages/menu.php
@@ -9,7 +9,7 @@ $page_type = $vars['page_type'];
 $url = elgg_get_site_url()."pg/admin/plugin_settings/sitepages/";
 ?>
 
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <ul>
 <?php
 	// @todo let users be able to add static content pages.
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 66debd5e2..4ccd5d7f4 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,7 +51,7 @@ if (isset($vars['entity'])) {
 				//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
 				echo parse_urls($desc);
 			?>
-			<p class="entity_subtext">
+			<p class="entity-subtext">
 			<?php
 				echo elgg_echo("thewire:wired") . " " . elgg_echo("thewire:strapline",
 								array(elgg_view_friendly_time($vars['entity']->time_created))
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 0e0674a7e..b654ccb51 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -8,7 +8,7 @@ $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
 $desc = $object->description;
 //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
 $string .= parse_urls($desc);
-$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 	if (isloggedin()){
 		$string .= "<a class='river_comment_form_button link'>Comment</a>";
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index 230711c49..a00acaec5 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -52,7 +52,7 @@
 	background-repeat: no-repeat;
 	background-position: right bottom; 
 }
-.members_list .wire_post { /* when displayed in lists of friends */
+.members-list .wire_post { /* when displayed in lists of friends */
 	margin-top:4px;
 }
 .wire_post_contents {
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 9a9c95ec0..09d878c81 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -19,7 +19,7 @@ $latest_wire = elgg_get_entities($params);
 if ($latest_wire) {
 	foreach ($latest_wire as $lw) {
 		$content = $lw->description;
-		$time = "<p class='entity_subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
+		$time = "<p class='entity-subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
 	}
 
 	echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>";
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index f7eee7fe9..e8d768b91 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -3,7 +3,7 @@
 * TinyMCE CSS
 */
 ?>
-#elgg_page_contents .mceButton {
+#elgg-page-contents .mceButton {
 	background-color: #e9e8e8;
 	border-color: #B2B2B2;
 	margin:4px;
@@ -11,13 +11,13 @@
 	-webkit-border-radius: 4px; 
 	-moz-border-radius: 4px;
 }
-#elgg_page_contents a.mceButtonEnabled:hover,
-#elgg_page_contents a.mceButtonActive,
-#elgg_page_contents a.mceButtonSelected {
+#elgg-page-contents a.mceButtonEnabled:hover,
+#elgg-page-contents a.mceButtonActive,
+#elgg-page-contents a.mceButtonSelected {
 	background-color: #d5d5d5;
 	border-color: #777 !important;
 }
-#elgg_page_contents .mceFocus .mceTop .mceLeft {
+#elgg-page-contents .mceFocus .mceTop .mceLeft {
 	background: #444444;
 	border-left: 1px solid #999;
 	border-top: 1px solid #999;
@@ -26,7 +26,7 @@
 	-khtml-border-top-left-radius: 4px;
 	border-top-left-radius: 4px;
 }
-#elgg_page_contents .mceFocus .mceTop .mceRight {
+#elgg-page-contents .mceFocus .mceTop .mceRight {
 	background: #444444;
 	border-right: 1px solid #999;
 	border-top: 1px solid #999;
@@ -35,18 +35,18 @@
 	-webkit-border-top-right-radius: 4px;
 	-moz-border-radius: 0 4px 0 0;
 }
-#elgg_page_contents .mceLayout{
+#elgg-page-contents .mceLayout{
 	border: 1px solid #CCC;
 	-webkit-border-radius: 5px; 
 	-moz-border-radius: 5px;
 }
-#elgg_page_contents table.mceLayout tr.mceFirst td {border-top:0px solid #CCC}
-#elgg_page_contents table.mceLayout tr.mceLast td {border-bottom:0px solid #CCC}
-#elgg_page_contents #blogbody_toolbar1{}
-#elgg_page_contents .mceToolbar{}
-#elgg_page_contents #blogbody_ifr{height:400px !important;} /* blogs */
+#elgg-page-contents table.mceLayout tr.mceFirst td {border-top:0px solid #CCC}
+#elgg-page-contents table.mceLayout tr.mceLast td {border-bottom:0px solid #CCC}
+#elgg-page-contents #blogbody_toolbar1{}
+#elgg-page-contents .mceToolbar{}
+#elgg-page-contents #blogbody_ifr{height:400px !important;} /* blogs */
 #pagesForm #description_ifr {height:400px !important;} /* pages */
-#elgg_page_contents .mceIframeContainer{}
+#elgg-page-contents .mceIframeContainer{}
 .wp_themeSkin .mceButtonDisabled {
 	border-color: #ccc !important;
 }