diff --git a/public/themes/hyperspace/default.php b/public/themes/hyperspace/default.php
index 8dce736..d787091 100644
--- a/public/themes/hyperspace/default.php
+++ b/public/themes/hyperspace/default.php
@@ -13,7 +13,7 @@ include __DIR__ . "/inc/header.inc.php";
             $image = get_complex_component("page-image", null, ['image']);
             ?>
             <span class="image fit sw-complex" data-json="<?php echo get_escaped_json($image); ?>" data-component="page-image">
-                <img src="<?php echo "file.php?file=" . $image['image']; ?>" alt="" />
+                <img src="<?php get_file_url($image['image']); ?>" alt="" />
             </span>
             <div class="sw-editable" data-component="content">
                 <?php get_page_content(); ?>
diff --git a/public/themes/hyperspace/home.php b/public/themes/hyperspace/home.php
index 89254cf..73a0970 100644
--- a/public/themes/hyperspace/home.php
+++ b/public/themes/hyperspace/home.php
@@ -184,7 +184,7 @@ include __DIR__ . "/inc/head.inc.php";
                     <ul class="contact">
                         <?php
                         output_conditional('<li><h3>Address</h3> <span>[[VAR]]</span></li>', str_replace("\n", "<br />\n", get_setting("address")));
-                        output_conditional('<li><h3>Email</h3> <a href="[[VAR]]">[[VAR]]</a></li>', get_setting("email"));
+                        output_conditional('<li><h3>Email</h3> <a href="mailto:[[VAR]]">[[VAR]]</a></li>', get_setting("email"));
                         output_conditional('<li><h3>Phone</h3> <a href="tel:[[VAR]]">' . get_setting("phone") . '</a></li>', preg_replace("/[^0-9+]/", "", get_setting("phone")));
                         ?>
                         <?php