diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl
index 9f8b4fff..cfaf4b6a 100644
--- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl
+++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl
@@ -10,175 +10,175 @@
             <thead>
               <tr>
                 <th></th>
-                <th>gen est.</th>
-                <th>found</th>
-                <th>valid</th>
-                <th>orphan</th>
-                <th>avg diff</th>
-                <th>shares est.</th>
-                <th>shares</th>
-                <th>percentage</th>
-                <th>amount</th>
-                <th>rate est.</th>
+                <th>Gen est.</th>
+                <th>Found</th>
+                <th>Valid</th>
+                <th>Orphan</th>
+                <th>Avg Diff</th>
+                <th>Shares est.</th>
+                <th>Shares</th>
+                <th>Percentage</th>
+                <th>Amount</th>
+                <th>Rate est.</th>
               </tr>
             </thead>
             <tbody>
               <tr>
                 <th style="padding-left: 15px">all time</th>
-                <td>{($firstblockfound / $coingentime)|number_format:"0"}</td>
-                <td>{$lastblocksbytime.total}</td>
-                <td>{$lastblocksbytime.totalvalid}</td>
-                <td>{$lastblocksbytime.totalorphan}</td>
+                <td>{($FIRSTBLOCKFOUND / $COINGENTIME)|number_format:"0"}</td>
+                <td>{$LASTBLOCKSBYTIME.Total}</td>
+                <td>{$LASTBLOCKSBYTIME.TotalValid}</td>
+                <td>{$LASTBLOCKSBYTIME.TotalOrphan}</td>
                 <td>
-                {if $lastblocksbytime.totalvalid > 0}
-                  {($lastblocksbytime.totaldifficulty / $lastblocksbytime.totalvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.TotalValid > 0}
+                  {($LASTBLOCKSBYTIME.TotalDifficulty / $LASTBLOCKSBYTIME.TotalValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.totalestimatedshares}</td>
-                <td>{$lastblocksbytime.totalshares}</td>
+                <td>{$LASTBLOCKSBYTIME.TotalEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.TotalShares}</td>
                 <td>
-                {if $lastblocksbytime.totalestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.totalshares / $lastblocksbytime.totalestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.totalshares / $lastblocksbytime.totalestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.TotalEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.TotalShares / $LASTBLOCKSBYTIME.TotalEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.totalamount}</td>
-                <td>{($lastblocksbytime.total|default:"0.00" / ($firstblockfound / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.TotalAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
               <tr>
                 <th style="padding-left: 15px">last hour</th>
-                <td>{(3600 / $coingentime)}</td>
-                <td>{$lastblocksbytime.1hourtotal}</td>
-                <td>{$lastblocksbytime.1hourvalid}</td>
-                <td>{$lastblocksbytime.1hourorphan}</td>
+                <td>{(3600 / $COINGENTIME)}</td>
+                <td>{$LASTBLOCKSBYTIME.1HourTotal}</td>
+                <td>{$LASTBLOCKSBYTIME.1HourValid}</td>
+                <td>{$LASTBLOCKSBYTIME.1HourOrphan}</td>
                 <td>
-                {if $lastblocksbytime.1hourvalid > 0}
-                  {($lastblocksbytime.1hourdifficulty / $lastblocksbytime.1hourvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.1HourValid > 0}
+                  {($LASTBLOCKSBYTIME.1HourDifficulty / $LASTBLOCKSBYTIME.HHourValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.1hourestimatedshares}</td>
-                <td>{$lastblocksbytime.1hourshares}</td>
+                <td>{$LASTBLOCKSBYTIME.1HourEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.1HourShares}</td>
                 <td>
-                {if $lastblocksbytime.1hourestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.1hourshares / $lastblocksbytime.1hourestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.1hourshares / $lastblocksbytime.1hourestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.1HourEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.1HourShares / $LASTBLOCKSBYTIME.1HourEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.1houramount}</td>
-                <td>{($lastblocksbytime.1hourtotal|default:"0.00" / (3600 / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.1HourAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
               <tr>
                 <th style="padding-left: 15px">last 24 hours</th>
-                <td>{(86400 / $coingentime)}</td>
-                <td>{$lastblocksbytime.24hourtotal}</td>
-                <td>{$lastblocksbytime.24hourvalid}</td>
-                <td>{$lastblocksbytime.24hourorphan}</td>
+                <td>{(86400 / $COINGENTIME)}</td>
+                <td>{$LASTBLOCKSBYTIME.24HourTotal}</td>
+                <td>{$LASTBLOCKSBYTIME.24HourValid}</td>
+                <td>{$LASTBLOCKSBYTIME.24HourOrphan}</td>
                 <td>
-                {if $lastblocksbytime.24hourvalid > 0}
-                  {($lastblocksbytime.24hourdifficulty / $lastblocksbytime.24hourvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.24HourValid > 0}
+                  {($LASTBLOCKSBYTIME.24HourDifficulty / $LASTBLOCKSBYTIME.24HourValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.24hourestimatedshares}</td>
-                <td>{$lastblocksbytime.24hourshares}</td>
+                <td>{$LASTBLOCKSBYTIME.24HourEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.24HourShares}</td>
                 <td>
-                {if $lastblocksbytime.24hourestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.24hourshares / $lastblocksbytime.24hourestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.24hourshares / $lastblocksbytime.24hourestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.24HourEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.24HourShares / $LASTBLOCKSBYTIME.24HourEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.24houramount}</td>
-                <td>{($lastblocksbytime.24hourtotal|default:"0.00" / (86400 / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.24HourAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
               <tr>
                 <th style="padding-left: 15px">last 7 days</th>
-                <td>{(604800 / $coingentime)}</td>
-                <td>{$lastblocksbytime.7daystotal}</td>
-                <td>{$lastblocksbytime.7daysvalid}</td>
-                <td>{$lastblocksbytime.7daysorphan}</td>
+                <td>{(604800 / $COINGENTIME)}</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysTotal}</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysValid}</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysOrphan}</td>
                 <td>
-                {if $lastblocksbytime.7daysvalid > 0}
-                  {($lastblocksbytime.7daysdifficulty / $lastblocksbytime.7daysvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.7DaysValid > 0}
+                  {($LASTBLOCKSBYTIME.7DaysDifficulty / $LASTBLOCKSBYTIME.7DaysValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.7daysestimatedshares}</td>
-                <td>{$lastblocksbytime.7daysshares}</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysShares}</td>
                 <td>
-                {if $lastblocksbytime.7daysestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.7daysshares / $lastblocksbytime.7daysestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.7daysshares / $lastblocksbytime.7daysestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.7DaysEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.7DaysShares / $LASTBLOCKSBYTIME.7DaysEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.7daysamount}</td>
-                <td>{($lastblocksbytime.7daystotal|default:"0.00" / (604800 / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.7DaysAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
               <tr>
-                <th style="padding-left: 15px">last 4 weeks</th>
-                <td>{(2419200 / $coingentime)}</td>
-                <td>{$lastblocksbytime.4weekstotal}</td>
-                <td>{$lastblocksbytime.4weeksvalid}</td>
-                <td>{$lastblocksbytime.4weeksorphan}</td>
+                <th style="padding-left: 15px">last 4 Weeks</th>
+                <td>{(2419200 / $COINGENTIME)}</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksTotal}</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksValid}</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksOrphan}</td>
                 <td>
-                {if $lastblocksbytime.4weeksvalid > 0}
-                  {($lastblocksbytime.4weeksdifficulty / $lastblocksbytime.4weeksvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.4WeeksValid > 0}
+                  {($LASTBLOCKSBYTIME.4WeeksDifficulty / $LASTBLOCKSBYTIME.4WeeksValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.4weeksestimatedshares}</td>
-                <td>{$lastblocksbytime.4weeksshares}</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksShares}</td>
                 <td>
-                {if $lastblocksbytime.4weeksestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.4weeksshares / $lastblocksbytime.4weeksestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.4weeksshares / $lastblocksbytime.4weeksestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.4WeeksEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.4WeeksShares / $LASTBLOCKSBYTIME.4WeeksEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.4weeksamount}</td>
-                <td>{($lastblocksbytime.4weekstotal|default:"0.00" / (2419200 / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.4WeeksAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
               <tr>
-                <th style="padding-left: 15px">last 12 month</th>
-                <td>{(29030400 / $coingentime)}</td>
-                <td>{$lastblocksbytime.12monthtotal}</td>
-                <td>{$lastblocksbytime.12monthvalid}</td>
-                <td>{$lastblocksbytime.12monthorphan}</td>
+                <th style="padding-left: 15px">last 12 Month</th>
+                <td>{(29030400 / $COINGENTIME)}</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthTotal}</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthValid}</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthOrphan}</td>
                 <td>
-                {if $lastblocksbytime.12monthvalid > 0}
-                  {($lastblocksbytime.12monthdifficulty / $lastblocksbytime.12monthvalid)|number_format:"4"}
+                {if $LASTBLOCKSBYTIME.12MonthValid > 0}
+                  {($LASTBLOCKSBYTIME.12MonthDifficulty / $LASTBLOCKSBYTIME.12MonthValid)|number_format:"4"}
                 {else}
                   0
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.12monthestimatedshares}</td>
-                <td>{$lastblocksbytime.12monthshares}</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthEstimatedShares}</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthShares}</td>
                 <td>
-                {if $lastblocksbytime.12monthestimatedshares > 0}
-                  <font color="{if (($lastblocksbytime.12monthshares / $lastblocksbytime.12monthestimatedshares * 100) <= 100)}green{else}red{/if}">{($lastblocksbytime.12monthshares / $lastblocksbytime.12monthestimatedshares * 100)|number_format:"2"}%</font></b>
+                {if $LASTBLOCKSBYTIME.12MonthEstimatedShares > 0}
+                  <font color="{if (($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100) <= 100)}green{else}red{/if}">{($LASTBLOCKSBYTIME.12MonthShares / $LASTBLOCKSBYTIME.12MonthEstimatedShares * 100)|number_format:"2"}%</font></b>
                 {else}
                   0.00%
                 {/if}
                 </td>
-                <td>{$lastblocksbytime.12monthamount}</td>
-                <td>{($lastblocksbytime.12monthtotal|default:"0.00" / (29030400 / $coingentime)  * 100)|number_format:"2"}%</td>
+                <td>{$LASTBLOCKSBYTIME.12MonthAmount}</td>
+                <td>{($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME)  * 100)|number_format:"2"}%</td>
               </tr>
             </tbody>
           </table>
         </div>
       </div>
       <div class="panel-footer">
-        {if $global.config.payout_system != 'pps'}<ul><li>note: round earnings are not credited until <font color="orange">{$global.confirmations}</font> confirms.</li></ul>{/if}
+        {if $GLOBAL.config.payout_system != 'pps'}<ul><li>note: round earnings are not credited until <font color="orange">{$GLOBAL.confirmations}</font> confirms.</li></ul>{/if}
       </div>
       <!-- /.panel -->
     </div>