diff --git a/app/styles/common/common.sass b/app/styles/common/common.sass
index 9504c9dc5..fae7f7afe 100644
--- a/app/styles/common/common.sass
+++ b/app/styles/common/common.sass
@@ -225,6 +225,7 @@ kbd
height: 60px
.popover
+ border-style: solid
border-image: url(/images/level/popover_background.png) 29 39 fill stretch
border-width: 15px 20px
.arrow
@@ -238,6 +239,7 @@ kbd
border: 0
border-radius: 0
@include box-shadow(none)
+ border-style: solid
border-image: url(/images/common/button-background-active-border.png) 14 20 20 20 fill round
border-width: 7px 10px 10px 10px
padding: 0
diff --git a/app/styles/modal/auth-modal.sass b/app/styles/modal/auth-modal.sass
index ca0d263af..d79f7bf0f 100644
--- a/app/styles/modal/auth-modal.sass
+++ b/app/styles/modal/auth-modal.sass
@@ -146,6 +146,7 @@
height: 70px
font-size: 32px
line-height: 42px
+ border-style: solid
border-image: url(/images/level/code_toolbar_submit_button_active.png) 14 20 20 20 fill round
border-width: 14px 20px 20px 20px
color: white
diff --git a/app/styles/play/level/control_bar.sass b/app/styles/play/level/control_bar.sass
index b95ef88f5..253e00cfa 100644
--- a/app/styles/play/level/control_bar.sass
+++ b/app/styles/play/level/control_bar.sass
@@ -100,6 +100,7 @@
height: 60px
margin: 0 auto
padding: 8px
+ border-style: solid
border-image: url(/images/level/control_bar_level_name_background.png) 30 fill round
border-width: 0 15px 15px 15px
text-align: center
@@ -128,6 +129,7 @@
height: 60px
margin: 0 auto
padding: 8px
+ border-style: solid
border-image: url(/images/level/control_bar_level_name_background.png) 30 fill round
border-width: 0 15px 15px 15px
text-align: center
diff --git a/app/styles/play/level/goals.sass b/app/styles/play/level/goals.sass
index 1d8e4a06f..09e46f2f3 100644
--- a/app/styles/play/level/goals.sass
+++ b/app/styles/play/level/goals.sass
@@ -6,6 +6,7 @@
left: -15px
top: -100px
@include transition(0.5s ease-in-out)
+ border-style: solid
border-image: url(/images/level/goals_background.png) 15 20 51 15 fill stretch
border-width: 8px 10px 25px 8px
margin: -8px -10px -25px -8px
diff --git a/app/styles/play/level/modal/hero-victory-modal.sass b/app/styles/play/level/modal/hero-victory-modal.sass
index 6344b42cb..463adc798 100644
--- a/app/styles/play/level/modal/hero-victory-modal.sass
+++ b/app/styles/play/level/modal/hero-victory-modal.sass
@@ -33,6 +33,7 @@
width: 750px
background: transparent
border: 0px solid transparent
+ border-style: solid
border-image: url("/images/pages/play/level/modal/victory_modal_border_background.png") 250 0 100 0 fill round
border-width: 250px 0 100px 0
border-radius: 12px
diff --git a/app/styles/play/level/tome/cast_button.sass b/app/styles/play/level/tome/cast_button.sass
index 4f442e660..3a8a8c45c 100644
--- a/app/styles/play/level/tome/cast_button.sass
+++ b/app/styles/play/level/tome/cast_button.sass
@@ -46,6 +46,7 @@
width: 45%
width: -webkit-calc(50% - 10px)
width: calc(50% - 10px)
+ border-style: solid
border-image: url(/images/level/code_toolbar_run_button_active.png) 14 20 20 20 fill round
border-width: 7px 10px 10px 10px
diff --git a/app/styles/play/level/tome/problem_alert.sass b/app/styles/play/level/tome/problem_alert.sass
index aaba3a19d..5c2f2027c 100644
--- a/app/styles/play/level/tome/problem_alert.sass
+++ b/app/styles/play/level/tome/problem_alert.sass
@@ -15,6 +15,7 @@
text-shadow: none
color: white
word-wrap: break-word
+ border-style: solid
border-image: url(/images/level/code_editor_error_background.png) 16 20 fill round
border-width: 16px 20px
diff --git a/app/styles/play/level/tome/spell_debug.sass b/app/styles/play/level/tome/spell_debug.sass
index 58d8b5f71..945b01d8f 100644
--- a/app/styles/play/level/tome/spell_debug.sass
+++ b/app/styles/play/level/tome/spell_debug.sass
@@ -7,6 +7,7 @@
min-width: 250px
max-width: 400px
padding: 10px
+ border-style: solid
border-image: url(/images/level/popover_background.png) 18 fill round
border-width: 8px
.progress
diff --git a/app/styles/play/level/tome/spell_list.sass b/app/styles/play/level/tome/spell_list.sass
index e988bfce0..7a234a402 100644
--- a/app/styles/play/level/tome/spell_list.sass
+++ b/app/styles/play/level/tome/spell_list.sass
@@ -9,6 +9,7 @@
left: 0%
right: 10%
padding: 4%
+ border-style: solid
border-image: url(/images/level/popover_background.png) 18 fill round
border-width: 15px
diff --git a/app/styles/play/level/tome/spell_list_entry_thangs.sass b/app/styles/play/level/tome/spell_list_entry_thangs.sass
index 5f8a275f7..b8faebba0 100644
--- a/app/styles/play/level/tome/spell_list_entry_thangs.sass
+++ b/app/styles/play/level/tome/spell_list_entry_thangs.sass
@@ -11,6 +11,7 @@
max-height: 500px
overflow: scroll
padding: 4%
+ border-style: solid
border-image: url(/images/level/popover_background.png) 18 fill round
border-width: 15px
diff --git a/app/styles/play/level/tome/spell_palette_entry.sass b/app/styles/play/level/tome/spell_palette_entry.sass
index 7ddba6bb9..bb0177039 100644
--- a/app/styles/play/level/tome/spell_palette_entry.sass
+++ b/app/styles/play/level/tome/spell_palette_entry.sass
@@ -55,6 +55,7 @@ body:not(.dialogue-view-active)
// Only those popovers which are our direct children (spell documentation)
max-width: 600px
padding: 0
+ border-style: solid
border-image: url(/images/level/popover_background.png) 29 39 fill stretch
border-width: 15px 20px
@include box-shadow(0 0 0 #000)
diff --git a/app/styles/play/level/tome/spell_toolbar.sass b/app/styles/play/level/tome/spell_toolbar.sass
index a29c2a137..a17f84769 100644
--- a/app/styles/play/level/tome/spell_toolbar.sass
+++ b/app/styles/play/level/tome/spell_toolbar.sass
@@ -82,6 +82,7 @@
position: absolute
z-index: 10
pointer-events: none
+ border-style: solid
border-image: url(/images/level/popover_background.png) 29 39 fill stretch
padding: 0
border-width: 15px 20px
diff --git a/app/styles/play/level/tome/tome.sass b/app/styles/play/level/tome/tome.sass
index 511a3fa14..ff6f691d0 100644
--- a/app/styles/play/level/tome/tome.sass
+++ b/app/styles/play/level/tome/tome.sass
@@ -37,6 +37,7 @@
.popover
padding: 10px 10px 30px 10px
+ border-style: solid
border-image: url(/images/level/popover_background.png) 18 fill round
border-width: 15px
@include box-shadow(0 0 0 #000)
diff --git a/app/styles/play/modal/subscribe-modal.sass b/app/styles/play/modal/subscribe-modal.sass
index fb1972e83..638a5992c 100644
--- a/app/styles/play/modal/subscribe-modal.sass
+++ b/app/styles/play/modal/subscribe-modal.sass
@@ -100,6 +100,7 @@
top: 430px
font-size: 32px
line-height: 42px
+ border-style: solid
border-image: url(/images/level/code_toolbar_submit_button_active.png) 14 20 20 20 fill round
border-width: 14px 20px 20px 20px
color: darken(white, 5%)
diff --git a/app/styles/play/world-map-view.sass b/app/styles/play/world-map-view.sass
index d82f6a3ad..6af3a0684 100644
--- a/app/styles/play/world-map-view.sass
+++ b/app/styles/play/world-map-view.sass
@@ -218,6 +218,7 @@ $gameControlMargin: 30px
border-width: 15px
// Using modernizr-mixin for compat detection
@include yep(borderimage)
+ border-style: solid
border-image: url(/images/level/popover_background.png) 18 fill round
@include nope(borderimage)
background-color: rgb(247, 242, 218)
diff --git a/app/views/play/WorldMapView.coffee b/app/views/play/WorldMapView.coffee
index 0fb1199a1..d0d72526e 100644
--- a/app/views/play/WorldMapView.coffee
+++ b/app/views/play/WorldMapView.coffee
@@ -141,8 +141,10 @@ module.exports = class WorldMapView extends RootView
level.color = 'rgb(80, 130, 200)'
level.hidden = level.locked or level.disabled
- # put lower levels in last, so in the world map they layer over one another properly.
- context.campaign.levels = (_.sortBy context.campaign.levels, 'y').reverse()
+ ## put lower levels in last, so in the world map they layer over one another properly.
+ #context.campaign.levels = (_.sortBy context.campaign.levels, 'y').reverse()
+ # Actually, there's some logic that depends on the order of iteration of levels to determine
+ # which one to do next when you're coming here not from a level; can we do this another way?
context.levelStatusMap = @levelStatusMap
context.levelPlayCountMap = @levelPlayCountMap