diff --git a/src/Layout.jl b/src/Layout.jl
index ee09665..8137fa7 100644
--- a/src/Layout.jl
+++ b/src/Layout.jl
@@ -319,6 +319,7 @@ function set_theme!(theme::Symbol)
   else
     THEMES[][Stipple.Theme.THEME_INDEX[]] = Stipple.Theme.to_asset(theme)
   end
+  Stipple.Theme.set_theme(theme)
 
   Stipple.Theme.THEME_INDEX[]
 end
@@ -354,7 +355,7 @@ function theme(; core_theme::Bool = true) :: Vector{String}
   end
 
   unique!(THEMES[])
-  set_theme!(:default) # set the default theme
+  set_theme!(Stipple.Theme.get_theme()) # set the default theme
 
   for f in THEMES[]
     _o = f()
@@ -365,8 +366,6 @@ function theme(; core_theme::Bool = true) :: Vector{String}
     push!(output, _o)
   end
 
-  @show "Output is going out"
-
   output
 end
 
diff --git a/src/Theme.jl b/src/Theme.jl
index 8370d4e..edaf23f 100644
--- a/src/Theme.jl
+++ b/src/Theme.jl
@@ -49,7 +49,6 @@ end
 
 function register_theme(name::Symbol, theme::String)
   THEMES[name] = theme
-  @show THEMES
 end