diff --git a/control.tscn b/control.tscn
index 9f1433a..990e610 100644
--- a/control.tscn
+++ b/control.tscn
@@ -1,11 +1,11 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://scripts/scaling.gd" type="Script" id=1]
 [ext_resource path="res://graphics/borders/prideborder.png" type="Texture" id=2]
 [ext_resource path="res://maps/level_select.tscn" type="PackedScene" id=3]
 [ext_resource path="res://scripts/crt.gdshader" type="Shader" id=4]
-[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=5]
-[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=6]
+[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
+[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=6]
 
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 4 )
@@ -15,14 +15,6 @@ shader_param/curvature = Vector2( 6, 6 )
 shader_param/scanline_opacity = Vector2( 0.4, 0.05 )
 shader_param/brightness = 1.25
 
-[sub_resource type="ShaderMaterial" id=2]
-shader = ExtResource( 6 )
-shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 )
-shader_param/border_corners = true
-
-[sub_resource type="Theme" id=3]
-default_font = ExtResource( 5 )
-
 [node name="Control" type="Control"]
 pause_mode = 2
 anchor_right = 1.0
@@ -63,11 +55,11 @@ render_target_update_mode = 3
 layer = 127
 
 [node name="CheatLabel" type="Label" parent="ViewportContainer/Viewport/CheatLayer"]
-material = SubResource( 2 )
+material = ExtResource( 6 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_right = -1.0
 margin_bottom = -5.0
-theme = SubResource( 3 )
+theme = ExtResource( 5 )
 align = 2
 valign = 2
diff --git a/objects/environment/barrier/barrier.tscn b/objects/environment/barrier/barrier.tscn
index ea89e0e..162b858 100644
--- a/objects/environment/barrier/barrier.tscn
+++ b/objects/environment/barrier/barrier.tscn
@@ -1,9 +1,9 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=8 format=2]
 
 [ext_resource path="res://objects/environment/barrier/barrier.gd" type="Script" id=1]
 [ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2]
-[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=3]
-[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4]
+[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=3]
+[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 2, 0.5 )
@@ -88,14 +88,6 @@ tracks/2/keys = {
 "values": [ Vector2( 1, 1 ), Vector2( 1, 0 ) ]
 }
 
-[sub_resource type="ShaderMaterial" id=5]
-shader = ExtResource( 4 )
-shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 )
-shader_param/border_corners = true
-
-[sub_resource type="Theme" id=6]
-default_font = ExtResource( 3 )
-
 [node name="Barrier" type="Node2D"]
 script = ExtResource( 1 )
 
@@ -117,12 +109,12 @@ anims/open = SubResource( 3 )
 
 [node name="Label" type="Label" parent="."]
 visible = false
-material = SubResource( 5 )
+material = ExtResource( 4 )
 margin_left = -18.0
 margin_top = -15.0
 margin_right = 22.0
 margin_bottom = 5.0
-theme = SubResource( 6 )
+theme = ExtResource( 3 )
 text = "00"
 align = 1
 
diff --git a/objects/hud/pause_screen.tscn b/objects/hud/pause_screen.tscn
index 8851117..a108e21 100644
--- a/objects/hud/pause_screen.tscn
+++ b/objects/hud/pause_screen.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://tilesets/t_gui.tres" type="TileSet" id=1]
 [ext_resource path="res://scripts/theme.tres" type="Theme" id=2]
 [ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=3]
 [ext_resource path="res://objects/hud/pause_screen.gd" type="Script" id=4]
+[ext_resource path="res://scripts/2ndpuberty_no_dropshadow.tres" type="Theme" id=5]
+[ext_resource path="res://scripts/2ndpuberty_outline.tres" type="Material" id=6]
 
 [node name="PauseScreen" type="CanvasLayer"]
 pause_mode = 2
@@ -27,11 +29,12 @@ color = Color( 0.239216, 0.239216, 0.443137, 1 )
 
 [node name="Paused" type="Label" parent="."]
 pause_mode = 2
+material = ExtResource( 6 )
 margin_left = 64.0
 margin_top = 56.0
 margin_right = 192.0
 margin_bottom = 70.0
-theme = ExtResource( 2 )
+theme = ExtResource( 5 )
 text = "PAUSED!"
 align = 1
 
diff --git a/scripts/2ndpuberty_no_dropshadow.tres b/scripts/2ndpuberty_no_dropshadow.tres
new file mode 100644
index 0000000..7491afd
--- /dev/null
+++ b/scripts/2ndpuberty_no_dropshadow.tres
@@ -0,0 +1,6 @@
+[gd_resource type="Theme" load_steps=2 format=2]
+
+[ext_resource path="res://fonts/2ndpuberty_no_dropshadow.fnt" type="BitmapFont" id=1]
+
+[resource]
+default_font = ExtResource( 1 )
diff --git a/scripts/2ndpuberty_outline.tres b/scripts/2ndpuberty_outline.tres
new file mode 100644
index 0000000..7d70a7b
--- /dev/null
+++ b/scripts/2ndpuberty_outline.tres
@@ -0,0 +1,8 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=2]
+
+[ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=1]
+
+[resource]
+shader = ExtResource( 1 )
+shader_param/border_color = Color( 0.219608, 0.219608, 0.219608, 1 )
+shader_param/border_corners = true