diff --git a/views/layouts/column2.php b/views/layouts/column2.php
index 8c1b342..0445471 100644
--- a/views/layouts/column2.php
+++ b/views/layouts/column2.php
@@ -9,7 +9,7 @@
 		<div id="sidebar">
 		    <h4>Operations</h4>
 			<?php
-			$this->widget('bootstrap.widgets.BootMenu', array(
+			$this->widget('bootstrap.widgets.TbMenu', array(
 				'items' => $this->menu,
 				'htmlOptions' => array('class' => 'operations'),
 			));
diff --git a/views/layouts/main.php b/views/layouts/main.php
index ab308f3..1b610d9 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -34,12 +34,12 @@
         Yii::import('p3pages.modules.*');
 
         $rootNode = P3Page::model()->findByAttributes(array('layout' => '_BootMenu'));
-        $this->widget('ext.crisu83.yii-bootstrap.widgets.BootNavbar', array(
+        $this->widget('ext.crisu83.yii-bootstrap.widgets.TbNavbar', array(
             //'fluid' => true,
             'collapse' => true,
             'items' => array(
                 array(
-                    'class' => 'bootstrap.widgets.BootMenu',
+                    'class' => 'bootstrap.widgets.TbMenu',
                     /* 'items' => array(
                       array('label' => 'Home', 'url' => array('/site/index')),
                       array('label' => 'About', 'url' => array('/site/page', 'view' => 'about')),
@@ -51,7 +51,7 @@
                 ),
                 //'<form class="navbar-search pull-left" action=""><input type="text" class="search-query span2" placeholder="Search"></form>',
                 array(
-                    'class' => 'bootstrap.widgets.BootMenu',
+                    'class' => 'bootstrap.widgets.TbMenu',
                     'htmlOptions' => array('class' => 'pull-right'),
                     'items' => array(
                         array(
@@ -67,7 +67,7 @@
                     )
                 ),
                 array(
-                    'class' => 'bootstrap.widgets.BootMenu',
+                    'class' => 'bootstrap.widgets.TbMenu',
                     'htmlOptions' => array('class' => 'pull-right'),
                     'items' => array(
                         array('label' => 'Phundament 3', 'url' => '#', 'visible' => !Yii::app()->user->isGuest, 'items' => array(
diff --git a/views/p3media/ckeditor/index.php b/views/p3media/ckeditor/index.php
index bac195d..e18f949 100644
--- a/views/p3media/ckeditor/index.php
+++ b/views/p3media/ckeditor/index.php
@@ -95,7 +95,7 @@
 	<div class="row">
 		<div class="span12">
 			<?php
-			$this->widget('bootstrap.widgets.BootThumbnails', array(
+			$this->widget('bootstrap.widgets.TbThumbnails', array(
 				'dataProvider' => $model->search(),
 				'template' => "{pager}\n{items}",
 				'itemView' => '_thumb',
@@ -117,7 +117,7 @@ function select(id,title){
 			return false;
 		}
 		var identifier = $('#preset').val();
-		if (confirm('Select #'+id+' as \''+identifier+'\'?')) {		
+		if (confirm('Select #'+id+' as \''+identifier+'\'?')) {
 			//alert(id+'-'+preset);
 			var split;
 			split = identifier.split('|')
diff --git a/views/p3media/index.php b/views/p3media/index.php
index bac195d..e18f949 100644
--- a/views/p3media/index.php
+++ b/views/p3media/index.php
@@ -95,7 +95,7 @@
 	<div class="row">
 		<div class="span12">
 			<?php
-			$this->widget('bootstrap.widgets.BootThumbnails', array(
+			$this->widget('bootstrap.widgets.TbThumbnails', array(
 				'dataProvider' => $model->search(),
 				'template' => "{pager}\n{items}",
 				'itemView' => '_thumb',
@@ -117,7 +117,7 @@ function select(id,title){
 			return false;
 		}
 		var identifier = $('#preset').val();
-		if (confirm('Select #'+id+' as \''+identifier+'\'?')) {		
+		if (confirm('Select #'+id+' as \''+identifier+'\'?')) {
 			//alert(id+'-'+preset);
 			var split;
 			split = identifier.split('|')
diff --git a/views/wiki/index.php b/views/wiki/index.php
index 5e7b8a5..a68830d 100644
--- a/views/wiki/index.php
+++ b/views/wiki/index.php
@@ -11,14 +11,14 @@
 	<div class="span10 offset2">
 
 		<?php
-		$this->widget('bootstrap.widgets.BootBreadcrumbs', array(
+		$this->widget('bootstrap.widgets.TbBreadcrumbs', array(
 			'links' => array($this->id => array('/wiki'), $page),
 		));
 		?>
 	</div>
 	<div class="span2">
 		<?php
-		$this->widget('bootstrap.widgets.BootMenu', array(
+		$this->widget('bootstrap.widgets.TbMenu', array(
 			'type' => 'list',
 			'items' => array_merge(array(array('label' => 'WIKI PAGES')), $items)
 		));