diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIEvents.page b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIEvents.page
index 7a89d60f..ea0de7f4 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIEvents.page
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMIEvents.page
@@ -2,22 +2,37 @@ Menu="IPMItool:3"
 Title="Event Log"
 ---
 <div>
-	<table style="margin-top:-21px;" class="tablesorter ipmi_sel" id="tblEvent">			
+	<table class="tablesorter hover-highlight" id="tblEvent">			
 		<thead>
 			<tr>
-				<th> Status </th>
-				<th> Event ID </th>
-				<th> Time Stamp </th>
-				<th> Sensor Name </th>
-				<th> Description </th>
-				<th><input id="allEvents" type="checkbox"></th>
+				<th class="sorter-false filter-false"> Status </th>
+				<th class="filter-false"> Event ID </th>
+				<th class="filter-time" data-placeholder="by time"> Time Stamp </th>
+				<th class="filter-name" data-placeholder="by name"> Sensor Name </th>
+				<th class="filter-desc" data-placeholder="Search..."> Description </th>
+				<th class="filter-false sorter-false"><a id='allEvents' title='delete all'><i class="fa fa-trash"> remove all </i></a></th>
 			</tr>
 		</thead>
 		<tbody>
 		</tbody>
 	</table>
-	<div style="margin-left:18px">
-		<button type="button" id="btnClearEvents"/>Clear</button>
-		<button type="button" onClick="eventArray();"/>Refresh</button>
- 	</div>
+</div>
+
+<div id="pager" class="pager">
+  <form>
+    <a class="first"><i class="fa fa-step-backward"></i></a>
+    <a class="prev"><i class="fa fa-backward"></i></a>
+    <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+    <a class="next"><i class="fa fa-forward"></i></a>
+    <a class="last"><i class="fa fa-step-forward"></i></a>
+    <select class="pagesize">
+      <option value="5">5</option>
+      <option value="10">10</option>
+      <option value="15">15</option>
+      <option value="20">20</option>
+      <option value="all">All</option>
+    </select>
+    &nbsp;
+    <a  title="reset filters" class="reset"><i class="fa fa-undo"></i></a>
+  </form>
 </div>
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISensors.page b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISensors.page
index e8610e0e..b252d91d 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISensors.page
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISensors.page
@@ -9,16 +9,19 @@ if($ipmitool_cfg['REMOTE'] == "enable") {
 	$ipmitool_options = " -I lanplus -H {$ipmitool_cfg['IPADDR']} -U {$ipmitool_cfg['USER']} -P ";
 	$ipmitool_password = $ipmitool_cfg['PASSWORD'];
 }
+$theme = $display["theme"];
 ?>
 
-<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
+<link type="text/css" rel="stylesheet" href="/plugins/ipmitool-plugin/css/ipmitool-plugin.css">
+<link type="text/css" rel="stylesheet" href="/plugins/tablesorter/css/tablesorter.css">
+<link type="text/css" rel="stylesheet" href="/plugins/tablesorter/css/tablesorter-<?=$theme;?>.css">
 
 <div>
 	<span class="status" style="margin-top: -22px;"><input type="checkbox" class="advancedview"></span>
-	<table style="margin-top:-21px;" class="tablesorter ipmi_sensors" id="tblSensor">
+	<table class="tablesorter" id="tblSensor">
 		<thead>
 			<tr>
-				<th> Status </th>
+				<th class="sorter-false"> Status </th>
 				<th> Sensor </th>
 				<th class="advanced" style="display:none"> Lower <br> Non-Recover </th>
 				<th class="advanced" style="display:none"> Lower <br> Critical </th>
@@ -33,13 +36,17 @@ if($ipmitool_cfg['REMOTE'] == "enable") {
 		<tbody>
 		</tbody>
 	</table>
-	<div style="margin-left:18px">
-		<button type="button" onClick="done();">Done</button>
-	</div>
 </div>
+<form markdown="1">
 
-<script type="text/javascript" src="/plugins/ipmitool-plugin/javascript/jquery.ipmitool-plugin.js"></script>
-<script type="text/javascript" src="/webGui/javascript/jquery.switchbutton.js"></script>
+&nbsp;
+: <button type="button" onClick="done();">Done</button>
+
+</form>
+
+<script type="text/javascript" src="/plugins/ipmitool-plugin/js/jquery.ipmitool-plugin.js"></script>
+<script type="text/javascript" src="/plugins/tablesorter/js/jquery.tablesorter.combined.min.js"></script>
+<script type="text/javascript" src="/plugins/tablesorter/js/pager/jquery.tablesorter.pager.js"></script>
 
 <script type="text/javascript">
 var Password = '<?=$ipmitool_password?>';
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
index 2ab48e5b..9d2c4866 100644
--- a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
+++ b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/IPMISettings.page
@@ -14,7 +14,7 @@ $ipmitool_password = isset($ipmitool_cfg['PASSWORD']) ? $ipmitool_cfg['PASSWORD'
 $ipmitool_running = trim(shell_exec( "[ -f /proc/`cat /var/run/ipmievd.pid0 2> /dev/null`/exe ] && echo 'yes' || echo 'no' 2> /dev/null" ));
 ?>
 
-<script type="text/javascript" src="/plugins/ipmitool-plugin/javascript/jquery.mask.js"></script>
+<script type="text/javascript" src="/plugins/ipmitool-plugin/js/jquery.mask.js"></script>
 
 <form markdown="1" name="ipmitool_settings" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="ipmitool-plugin/ipmitool-plugin.cfg" />
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/event/started b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/event/started
old mode 100755
new mode 100644
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/event/stopping_svcs b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/event/stopping_svcs
old mode 100755
new mode 100644
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/ipmitail b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/ipmitail
old mode 100755
new mode 100644
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/start b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/start
old mode 100755
new mode 100644
diff --git a/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/stop b/source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/scripts/stop
old mode 100755
new mode 100644