diff --git a/head.php b/head.php
index 96e7b1c..5ab2d1d 100644
--- a/head.php
+++ b/head.php
@@ -13,6 +13,6 @@
 
 <script>
     $(function() {
-        $("body").attr("data-bs-theme", "dark");
+        $("body").attr("data-bs-theme", "");
     });
 </script>
diff --git a/lib/DataTable.php b/lib/DataTable.php
index 3b00af4..f1ad8e5 100644
--- a/lib/DataTable.php
+++ b/lib/DataTable.php
@@ -4,9 +4,9 @@
         public static function sortIcon()
         {
             ?>
-                <i class="fa fa-fw fa-sort sort ordered"></i>
-                <i class="fa fa-fw fa-arrow-down-short-wide sort asc d-none"></i>
-                <i class="fa fa-fw fa-arrow-up-wide-short sort desc d-none"></i>
+                <i class="text-secondary fa fa-fw fa-sort sort ordered"></i>
+                <i class="text-secondary fa fa-fw fa-arrow-down-short-wide sort asc d-none"></i>
+                <i class="text-secondary fa fa-fw fa-arrow-up-wide-short sort desc d-none"></i>
             <?php
         }
 
diff --git a/pages/run.php b/pages/run.php
index 30c0c81..499aee9 100644
--- a/pages/run.php
+++ b/pages/run.php
@@ -4,8 +4,8 @@
     global $varRows;
 
     $strQueryDir = "files/sql";
-
-    $varFiles = scandir($strQueryDir);
+        
+    $varFiles = is_dir($strQueryDir)? scandir($strQueryDir) : [];
     $varFiles = array_diff($varFiles, [".", ".."]);
 
     $strSelection   = Request::getArg(0);
@@ -18,14 +18,17 @@
 
     if ($strSelection !== null && strlen($strSelection) > 0)
     {
+        $strSelection = urldecode($strSelection);
         $strFileData = file_get_contents("{$strQueryDir}/{$strSelection}");
 
         // Get the inputs:
         preg_match_all(
-            "/declare\s+\@([A-Za-z0-9]{1,})\s+(.+)\s+=\s+\?/i",
+            "/declare\s+\@([A-Za-z0-9]{1,})\s+(.+)\s+=\s+\?;(\s+-- Default\:\s(.*))?/i",
             $strFileData,
             $varInputs);
 
+        //Respond::json($varInputs);
+
         // Get the options defined in comments:
         preg_match_all(
             "/--\s+([A-Za-z0-9]{1,})\:\s+(.+)/i",
@@ -112,9 +115,17 @@
     $strTitle = $strTitle ?? $strSelection ?? "Report";
 ?>
 
+<?php if (array_key_exists("scale", $varOptions)): ?>
+    <style>
+        table {
+            font-size: <?= $varOptions["scale"]; ?>em;
+        }
+    </style>
+<?php endif; ?>
+
 <title><?= $strTitle; ?></title>
 
-<div class="navbar navbar-expand bg-primary d-print-none">
+<div class="navbar navbar-expand bg-primary navbar-dark d-print-none">
     <div class="container-fluid justify-content-between">
         <div class="d-inline-flex align-items-center">
             <a class="navbar-brand" href="/"><?= $strTitle; ?></a>
@@ -153,12 +164,12 @@
         <?php endif; ?>
 
         <div class="row">
-            <div class="col-md-4">
+            <div class="col-md-6">
                 <div class="mb-3">
                     <label>Choose Query</label>
                     <div class="input-group">
                         <span class="input-group-text"><i class="fa fa-fw fa-folder"></i></span>
-                        <input type="text" class="form-control" name="query" placeholder="e.g. fsp_Test.sql" value="<?= $strSelection; ?>" id="query-search" />
+                        <input type="text" class="form-control" name="query" placeholder="Search files..." value="<?= $strSelection; ?>" id="query-search" />
                     </div>
                     <div class="query-search-results">
                         <?php foreach ($varFiles as $f): ?>
@@ -176,24 +187,24 @@
 
         <?php if ($intAllowed == 1): ?>
 
-            <?php foreach (["danger", "warning", "info"] as $strClass): ?>
+            <?php foreach (["description"] as $strClass): ?>
                 <?php if (array_key_exists($strClass, $varOptions)): ?>
                     <div class="row">
-                        <div class="col-md-4">
-                            <div class="alert alert-<?= $strClass; ?>">
-                                <strong><?= ucfirst($strClass); ?>:</strong> <?= $varOptions[$strClass]; ?>
+                        <div class="col-md-6">
+                            <div class="mb-3">
+                                <?= $varOptions[$strClass]; ?>
                             </div>
                         </div>
                     </div>
                 <?php endif; ?>
             <?php endforeach; ?>
 
-            <?php foreach (["description"] as $strClass): ?>
+            <?php foreach (["danger", "warning", "info"] as $strClass): ?>
                 <?php if (array_key_exists($strClass, $varOptions)): ?>
                     <div class="row">
-                        <div class="col-md-4">
-                            <div class="mb-3">
-                                <?= $varOptions[$strClass]; ?>
+                        <div class="col-md-6">
+                            <div class="alert alert-<?= $strClass; ?>">
+                                <strong><?= ucfirst($strClass); ?>:</strong> <?= $varOptions[$strClass]; ?>
                             </div>
                         </div>
                     </div>
@@ -211,16 +222,20 @@
 
                             if ($strInputType == "datetime")
                                 $strInputTypeHTML = "date";
+
+                            $strInputDefaultValue = "";
+                            if (strlen($varInputs[4][$i]) > 0)
+                                $strInputDefaultValue = $varInputs[4][$i];
                         ?>
 
                         <div class="row">
-                            <div class="col-md-4">
+                            <div class="col-md-6">
                                 <div class="mb-3">
                                     <label><?= $strInputName; ?> <code><?= $strInputType; ?></code></label>
 
                                     <div class="input-group">
                                         <span class="input-group-text"><i class="fa fa-fw fa-at"></i></span>
-                                        <input type="<?= $strInputTypeHTML; ?>" class="form-control" name="<?= $strInputName; ?>" value="<?= Request::getParam($strInputName); ?>" />
+                                        <input type="<?= $strInputTypeHTML; ?>" class="form-control" name="<?= $strInputName; ?>" value="<?= Request::getParam($strInputName) ?? $strInputDefaultValue; ?>" />
                                     </div>
                                 </div>
                             </div>
@@ -230,11 +245,11 @@
 
 
                 <div class="row">
-                    <div class="col-md-4">
+                    <div class="col-md-6">
                         <div class="mb-3">
                             <label>Actions</label>
                             <div>
-                                <a class="btn btn-outline-primary" onclick="fnSubmit(this);"><i class="fa fa-fw fa-server me-1"></i> Execute</a>
+                                <a class="btn btn-primary" onclick="fnSubmit(this);"><i class="fa fa-fw fa-server me-1"></i> Execute</a>
                             </div>
                         </div>
                     </div>
@@ -246,7 +261,7 @@
         <?php else: ?>
 
             <div class="row">
-                <div class="col-md-4">
+                <div class="col-md-6">
                     <div class="text-danger mb-3">
                         The selected report requires being logged in as a user with permission to run it.
                     </div>
@@ -269,21 +284,40 @@
         ?>
 
         <div class="d-none d-print-block">
-            <h1><?=  $strTitle; ?></h1>
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="col-md-6">
+                        <h1><?= $strTitle; ?></h1>
 
-            <ul>
-                <?php foreach ($varPosted as $k => $v): ?>
-                    <li><?= $k; ?>: <?= $v; ?></li>
-                <?php endforeach; ?>
-                <li>Printed: <?= date("Y-m-d H:i:s"); ?></li>
-            </ul>
+                        <?php foreach (["description"] as $strClass): ?>
+                            <?php if (array_key_exists($strClass, $varOptions)): ?>
+                                <p><?= $varOptions[$strClass]; ?></p>
+                            <?php endif; ?>
+                        <?php endforeach; ?>
+                    </div>
+
+                    <div class="col-md-6">
+                        <ul>
+                            <?php foreach ($varPosted as $k => $v): ?>
+                                <li><?= $k; ?>: <?= $v; ?></li>
+                            <?php endforeach; ?>
+                            <li>Printed: <?= date("Y-m-d H:i:s"); ?></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="table-responsive">
-            <table class="table table-sm table-striped table-bordered w-100" id="table">
+            <table class="table table-sm table-bordered w-100" id="table">
                 <thead>
                     <tr>
                         <?php foreach ($varColumns as $col): ?>
+                            <?php
+                                // Hide columns that begin with underscore:
+                                if ($col[0] == "_")
+                                    continue;
+                            ?>
                             <th class="text-nowrap sorting"><?= $col; ?> <?php DataTable::sortIcon(); ?></th>
                         <?php endforeach; ?>
                     </tr>
@@ -291,9 +325,39 @@
 
                 <tbody>
                     <?php foreach ($varRows as $r): ?>
+                        <?php
+                            // Allow SQL data to control row classes with _row_class column:
+                            $strRowClass = "";
+                            if (array_key_exists("_row_class", $r))
+                                $strRowClass = $r["_row_class"];
+
+                            $strNextCellClass = "";
+                        ?>
                         <tr>
                             <?php foreach ($varColumns as $col): ?>
-                                <td><?= $r[$col]; ?></td>
+                                <?php
+                                    $strCellClass = "";
+
+                                    if (strlen($strRowClass) > 0)
+                                        $strCellClass = $strRowClass;
+
+                                    if (strlen($strNextCellClass) > 0)
+                                        $strCellClass = $strNextCellClass;
+
+                                    // Allow SQL data to controll next cell class with _next_cell_class column:
+                                    if (preg_match("/^_next_cell_class/i", $col))
+                                        $strNextCellClass = $r[$col];
+
+                                    // Hide columns that begin with underscore:
+                                    if ($col[0] == "_")
+                                        continue;
+                                ?>
+
+                                <td class="<?= $strCellClass; ?>"><?= $r[$col]; ?></td>
+
+                                <?php
+                                    $strNextCellClass = "";
+                                ?>
                             <?php endforeach; ?>
                         </tr>
                     <?php endforeach; ?>
@@ -307,6 +371,11 @@
     $(function() {
         var fileSearch = $("#query-search").first();
 
+        fileSearch.on("focus", function() {
+            fileSearch.trigger("input");
+            fileSearch.select();
+        });
+
         fileSearch.on("input", function() {
             var q = fileSearch.val();
 
@@ -314,8 +383,8 @@
                 x = $(x);
                 x.addClass("d-none");
 
-                if (q.length < 1)
-                    return;
+                //if (q.length < 1)
+                //    return;
 
                 var fileName = x.text();