diff --git a/theme/bulma/errors.php b/theme/bulma/errors.php
index 2c8b02d..222a7bb 100644
--- a/theme/bulma/errors.php
+++ b/theme/bulma/errors.php
@@ -15,7 +15,7 @@
                         <form action="" method="post">
                             <div class="field has-addons">
                                 <div class="control">
-                                    <input type="hidden" name="id" value="<?php echo $paste_id; ?>"/>
+                                    <input type="hidden" name="id" value="<?= $paste_id; ?>"/>
                                     <input type="password" class="input" name="mypass"
                                            placeholder="Password" />
                                 </div>
diff --git a/theme/bulma/login.php b/theme/bulma/login.php
index 5ca4aeb..85e364b 100644
--- a/theme/bulma/login.php
+++ b/theme/bulma/login.php
@@ -3,25 +3,24 @@
     <div class="bd-main-container container">
         <div class="bd-duo">
             <div class="bd-lead">
-                <?php
-                // Logged in
-                if (isset($success)) {
-                    echo '<div class="notification is-success"><i class="fa fa-exclamation-circle"></i> ' . $success . '</div>';
-                    if (isset($new_password)) {
-                        echo '<p>Your new password is as follows:</p>';
-                        echo "<code>${new_password}</code><br>";
-                    }
+                <?php if (isset($success)): ?>
+                    <div class="notification is-success"><i class="fa fa-exclamation-circle" aria-hidden="true"></i><?= pp_html_escape($success); ?></div>
+                    <?php if (isset($new_password)): ?>
+                        <p>Your new password is as follows:</p>
+                        <code><?= pp_html_escape($new_password); ?></code>
+                        <br>
+                    <?php endif; ?>
 
-                    if (isset($recovery_code)) {
-                        echo '<br><span class="tag is-danger is-medium">IMPORTANT!</span>';
-                        echo '<p><b>If you wish to recover your account later, you will need the following code. Store it in a safe place!</b></p>';
-                        echo "<code id='recovery'>${recovery_code}</code>";
-                        echo '<p>If you do not save this code and you forget your password, there is no way to get your account back!</p>';
-                    }
-                } // Errors
-                elseif (isset($error)) {
-                    echo '<div class="notification is-info"><i class="fa fa-exclamation-circle" aria-hidden=" true"></i> ' . $error . '</p></div>';
-                }
+                    <?php if (isset($recovery_code)): ?>
+                        <br><span class="tag is-danger is-medium">IMPORTANT!</span>
+                        <p><b>If you wish to recover your account later, you will need the following code. Store it in a safe place!</b></p>
+                        <code id="recovery"><?= pp_html_escape($recovery_code); ?></code>
+                        <p>If you do not save this code, and you forget your password, there is no way to get your account back!</p>
+                    <?php endif; ?>
+                <?php elseif (isset($error)): ?>
+                    <div class="notification is-info"><i class="fa fa-exclamation-circle" aria-hidden="true"></i><?= pp_html_escape($error); ?></p></div>
+                <?php endif; ?>
+                <?php
                 // Login page
                 if (isset($_GET['login'])) {
                     ?>
diff --git a/theme/bulma/profile.php b/theme/bulma/profile.php
index 22ed474..fbe6362 100644
--- a/theme/bulma/profile.php
+++ b/theme/bulma/profile.php
@@ -10,11 +10,11 @@
                 <?php
                 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                     if (isset($success)) {
-                        echo ' <div class="notification is-success"><i class="fa fa-exclamation-circle" aria-hidden=" true"></i> 
+                        echo ' <div class="notification is-success"><i class="fa fa-exclamation-circle" aria-hidden=" rue"></i> 
 					' . $success . '
 					</div>';
                     } elseif (isset($error)) {
-                        echo ' <div class="notification is-danger"><i class="fa fa-exclamation-circle" aria-hidden=" true"></i> 
+                        echo ' <div class="notification is-danger"><i class="fa fa-exclamation-circle" aria-hidden="true"></i> 
 					' . $error . '
 					</div>';
                     }
diff --git a/theme/bulma/user_profile.php b/theme/bulma/user_profile.php
index fdf1750..6fce0ec 100644
--- a/theme/bulma/user_profile.php
+++ b/theme/bulma/user_profile.php
@@ -60,9 +60,9 @@
                     outputBadges($paste_view_badges, $profile_total_paste_views, 'total_views');
 
                     if (($profile_total_unlisted >= 5) && ($profile_total_unlisted <= 9)) {
-                        echo '<img src = "/img/badges/pastehidden.png" title="[ShadowWriter] Have more than Five unlisted pastes" style="margin:5px">';
+                        echo '<img src="/img/badges/pastehidden.png" title="[ShadowWriter] Have more than Five unlisted pastes" style="margin:5px">';
                     } elseif ($profile_total_unlisted >= 10) {
-                        echo '<img src = "/img/badges/pastehidden.png" title="[Ghostwriter]  Have more than Ten unlisted pastes" style="margin:5px">';
+                        echo '<img src="/img/badges/pastehidden.png" title="[Ghostwriter]  Have more than Ten unlisted pastes" style="margin:5px">';
                     }
 
                     ?>
diff --git a/theme/bulma/view.php b/theme/bulma/view.php
index 9956824..305532a 100644
--- a/theme/bulma/view.php
+++ b/theme/bulma/view.php
@@ -99,18 +99,25 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                     <div class="columns is-multiline">
                         <div class="column is-4">
                             <span class="tag is-normal"><i class="fa fa-code fa-lg"
-                                                           aria-hidden="true"></i>&nbsp;&nbsp;<?php echo strtoupper($paste['code']); ?></span>
+                                                           aria-hidden="true"></i>&nbsp;&nbsp;<?php echo strtoupper(pp_html_escape($paste['code'])); ?></span>
                             <span class="tag is-normal"><i class="fa fa-eye fa-lg"
                                                            aria-hidden="true"></i>&nbsp;&nbsp;<?php echo $paste['views']; ?></span>
                             <span class="tag is-normal"><i class="fa fa-star fa-lg"
                                                            aria-hidden="true"></i>&nbsp;&nbsp;<?php echo $fav_count; ?></span>
                             <br>
-                            <span class="tag is-normal"><i class="fa fa-file-word fa-lg" aria-hidden="true"></i>&nbsp;&nbsp; <?php $wordcount = str_word_count($op_content);
-                                echo $wordcount ?></span>
-                            <span class="tag is-normal"><i class="fa fa-hdd fa-lg"
-                                                           aria-hidden="true"></i>&nbsp;&nbsp;<?php $pastesize = strlen($op_content);
-                                echo formatBytes($pastesize) ?></span>
-                            <span class="tag is-normal"><i class="fa fa-list-ol fa-lg" aria-hidden="true"></i>&nbsp;&nbsp;<?php echo substr_count($op_content, "\n") + 1; ?></span>
+                            <span class="tag is-normal">
+                                <i class="fa fa-file-word fa-lg" aria-hidden="true"></i>
+                                &nbsp;&nbsp;
+                                <?= str_word_count($op_content); ?>
+                            </span>
+                            <span class="tag is-normal">
+                                <i class="fa fa-hdd fa-lg" aria-hidden="true"></i>
+                                <?= formatBytes(strlen($op_content)) ?>
+                            </span>
+                            <span class="tag is-normal">
+                                <i class="fa fa-list-ol fa-lg" aria-hidden="true"></i>&nbsp;&nbsp;
+                                <?php echo substr_count($op_content, "\n") + 1; ?>
+                            </span>
                         </div>
                         <div class="column is-4 has-text-centered">
                             <h1 class="title is-6" style="margin-bottom:0;"><?= $paste['title'] ?></h1>
@@ -240,19 +247,14 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                                     <div class="select">
                                         <div class="select">
                                             <select data-live-search="true" name="format">
-                                                <?php // Show popular GeSHi formats
-                                                foreach (PP_HIGHLIGHT_FORMATS as $code => $name) {
-                                                    $sel = ($paste['code'] == $code) ? 'selected="selected"' : ' ';
-                                                    echo '<option ' . $sel . ' value="' . $code . '">' . $name . '</option>';
-                                                }
-                                                ?>
+                                                <?= optionsForSelect(array_values(PP_HIGHLIGHT_FORMATS), array_keys(PP_HIGHLIGHT_FORMATS), $paste->code); ?>
                                             </select>
                                         </div>
                                     </div>
                                 </div>
                                 <div class="level-item is-pulled-left mx-1">
                                     <input class="button is-info" type="hidden" name="paste_id"
-                                           value="<?php echo $paste_id; ?>"/>
+                                           value="<?= $paste->id; ?>"/>
                                 </div>
                                 <div class="level-item is-pulled-left mx-1">
                                     <a class="button"
@@ -264,8 +266,7 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                         <!-- Text area -->
                         <textarea style="line-height: 1.2;" class="textarea mx-1" rows="13" id="code"
                                   name="paste_data" onkeyup="countChars(this);"
-                                  onkeydown="return catchTab(this,event)"
-                                  placeholder="helloworld"><?php echo htmlentities($op_content, ENT_QUOTES, 'UTF-8'); ?></textarea>
+                                  onkeydown="return catchTab(this,event)"><?= pp_html_escape($op_content); ?></textarea>
                         <p id="charNum"><b>File Size: </b><span style="color: green;">1000/1000Kb</span></p>
                         <br>
 
@@ -317,19 +318,16 @@ $selectedloader = "$bg[$i]"; // set variable equal to which random filename was
                                             <!-- Visibility -->
                                             <div class="select">
                                                 <select name="visibility">
-                                                    <option value="0" <?php echo ($p_visible == "0") ? 'selected="selected"' : ''; ?>>
-                                                        Public
-                                                    </option>
-                                                    <option value="1" <?php echo ($p_visible == "1") ? 'selected="selected"' : ''; ?>>
-                                                        Unlisted
-                                                    </option>
-                                                    <?php if ($current_user) { ?>
-                                                        <option value="2" <?php echo ($p_visible == "2") ? 'selected="selected"' : ''; ?>>
-                                                            Private
-                                                        </option>
-                                                    <?php } else { ?>
-                                                        <option disabled>Private</option>
-                                                    <?php } ?>
+                                                    <?php
+                                                        $visibility_names = ['Public', 'Unlisted'];
+                                                        $visibility_codes = ['0', '1'];
+                                                        if ($current_user) {
+                                                            $visibility_names[] = 'Private';
+                                                            $visibility_codes[] = '2';
+                                                        }
+
+                                                        echo optionsForSelect($visibility_names, $visibility_codes, $p_visible);
+                                                    ?>
                                                 </select>
                                             </div>
                                         </div>