diff --git a/Project.toml b/Project.toml
index 4ec5d73..a4e05b6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,14 +1,14 @@
 name = "AbstractGPsMakie"
 uuid = "7834405d-1089-4985-bd30-732a30b92057"
 authors = ["David Widmann"]
-version = "0.1.1"
+version = "0.2.0"
 
 [deps]
 AbstractGPs = "99985d1d-32ba-4be9-9821-2ec096f28918"
-AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 
 [compat]
 AbstractGPs = "0.3"
-AbstractPlotting = "0.17.1, 0.18"
+Makie = "0.13"
 julia = "1.3"
diff --git a/docs/Manifest.toml b/docs/Manifest.toml
index ead1001..c191ad3 100644
--- a/docs/Manifest.toml
+++ b/docs/Manifest.toml
@@ -8,21 +8,15 @@ version = "1.0.1"
 
 [[AbstractGPs]]
 deps = ["ChainRulesCore", "Distributions", "FillArrays", "KernelFunctions", "LinearAlgebra", "Random", "RecipesBase", "Reexport", "Statistics", "StatsBase"]
-git-tree-sha1 = "8836d3678db8f296da785c146a46d1f44a724c72"
+git-tree-sha1 = "20056557a247d5857c278c591461ff34c7e4d0c3"
 uuid = "99985d1d-32ba-4be9-9821-2ec096f28918"
-version = "0.3.1"
+version = "0.3.4"
 
 [[AbstractGPsMakie]]
-deps = ["AbstractGPs", "AbstractPlotting", "LinearAlgebra"]
+deps = ["AbstractGPs", "LinearAlgebra", "Makie"]
 path = ".."
 uuid = "7834405d-1089-4985-bd30-732a30b92057"
-version = "0.1.0"
-
-[[AbstractPlotting]]
-deps = ["Animations", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LinearAlgebra", "Markdown", "Match", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StructArrays", "UnicodeFun"]
-git-tree-sha1 = "60183321f012000f408797b6753540cd26bf2cba"
-uuid = "537997a7-5e4e-5d89-9595-2241ea00577e"
-version = "0.16.10"
+version = "0.2.0"
 
 [[Adapt]]
 deps = ["LinearAlgebra"]
@@ -41,9 +35,9 @@ uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
 
 [[ArrayInterface]]
 deps = ["IfElse", "LinearAlgebra", "Requires", "SparseArrays", "Static"]
-git-tree-sha1 = "2fbfa5f372352f92191b63976d070dc7195f47a4"
+git-tree-sha1 = "4e988d6883cf3935e267f93f53cfc34792e0700f"
 uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
-version = "3.1.7"
+version = "3.1.15"
 
 [[Artifacts]]
 uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
@@ -75,10 +69,10 @@ uuid = "159f3aea-2a34-519c-b102-8c37f9878175"
 version = "1.0.5"
 
 [[CairoMakie]]
-deps = ["AbstractPlotting", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "StaticArrays"]
-git-tree-sha1 = "40b89529b6218a5631ec3886f7b8733dd60f0c71"
+deps = ["Base64", "Cairo", "Colors", "FFTW", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "SHA", "StaticArrays"]
+git-tree-sha1 = "a8ae66fce2903a56cf290f2f70e85fb98e24d279"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
-version = "0.4.2"
+version = "0.5.2"
 
 [[Cairo_jll]]
 deps = ["Artifacts", "Bzip2_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
@@ -88,9 +82,9 @@ version = "1.16.0+6"
 
 [[ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "44e9f638aa9ed1ad58885defc568c133010140aa"
+git-tree-sha1 = "b391f22252b8754f4440de1f37ece49d8a7314bb"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "0.9.37"
+version = "0.9.44"
 
 [[ColorBrewer]]
 deps = ["Colors", "JSON", "Test"]
@@ -100,9 +94,9 @@ version = "0.4.0"
 
 [[ColorSchemes]]
 deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"]
-git-tree-sha1 = "d3cf83862f70d430d4b34e43ed65e74bd50ae0e0"
+git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402"
 uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
-version = "3.11.0"
+version = "3.12.1"
 
 [[ColorTypes]]
 deps = ["FixedPointNumbers", "Random"]
@@ -111,27 +105,32 @@ uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
 version = "0.10.12"
 
 [[ColorVectorSpace]]
-deps = ["ColorTypes", "Colors", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "StatsBase"]
-git-tree-sha1 = "4d17724e99f357bfd32afa0a9e2dda2af31a9aea"
+deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
+git-tree-sha1 = "42a9b08d3f2f951c9b283ea427d96ed9f1f30343"
 uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4"
-version = "0.8.7"
+version = "0.9.5"
 
 [[Colors]]
 deps = ["ColorTypes", "FixedPointNumbers", "Reexport"]
-git-tree-sha1 = "82f4e6ff9f847eca3e5ebc666ea2cd7b48e8b47e"
+git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40"
 uuid = "5ae59095-9a9b-59fe-a467-6f913c188581"
-version = "0.12.7"
+version = "0.12.8"
 
 [[Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "ac4132ad78082518ec2037ae5770b6e796f7f956"
+git-tree-sha1 = "e4e2b39db08f967cc1360951f01e8a75ec441cab"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.27.0"
+version = "3.30.0"
 
 [[CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
+[[CompositionsBase]]
+git-tree-sha1 = "f3955eb38944e5dd0fabf8ca1e267d94941d34a5"
+uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b"
+version = "0.1.0"
+
 [[Contour]]
 deps = ["StaticArrays"]
 git-tree-sha1 = "9f02045d934dc030edad45944ea80dbd1f0ebea7"
@@ -163,10 +162,10 @@ deps = ["Mmap"]
 uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[Distances]]
-deps = ["LinearAlgebra", "Statistics"]
-git-tree-sha1 = "366715149014943abd71aa647a07a43314158b2d"
+deps = ["LinearAlgebra", "Statistics", "StatsAPI"]
+git-tree-sha1 = "abe4ad222b26af3337262b8afb28fab8d215e9f8"
 uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
-version = "0.10.2"
+version = "0.10.3"
 
 [[Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
@@ -174,9 +173,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[Distributions]]
 deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
-git-tree-sha1 = "e64debe8cd174cc52d7dd617ebc5492c6f8b698c"
+git-tree-sha1 = "3f61d283e34acbebba27c459cf7ea28ec6cc56fb"
 uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
-version = "0.24.15"
+version = "0.25.1"
 
 [[DocStringExtensions]]
 deps = ["LibGit2", "Markdown", "Pkg", "Test"]
@@ -208,9 +207,9 @@ version = "1.1.0"
 
 [[Expat_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "1402e52fcda25064f51c77a9655ce8680b76acf0"
+git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f"
 uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
-version = "2.2.7+6"
+version = "2.2.10+0"
 
 [[FFMPEG]]
 deps = ["FFMPEG_jll", "x264_jll"]
@@ -225,10 +224,10 @@ uuid = "b22a6f82-2f65-5046-a5b2-351ab43fb4e5"
 version = "4.3.1+4"
 
 [[FFTW]]
-deps = ["AbstractFFTs", "FFTW_jll", "IntelOpenMP_jll", "Libdl", "LinearAlgebra", "MKL_jll", "Reexport"]
-git-tree-sha1 = "1b48dbde42f307e48685fa9213d8b9f8c0d87594"
+deps = ["AbstractFFTs", "FFTW_jll", "LinearAlgebra", "MKL_jll", "Preferences", "Reexport"]
+git-tree-sha1 = "746f68839306977040653ebbd249e39c15420b8a"
 uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
-version = "1.3.2"
+version = "1.4.1"
 
 [[FFTW_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -238,9 +237,9 @@ version = "3.3.9+7"
 
 [[FileIO]]
 deps = ["Pkg", "Requires", "UUIDs"]
-git-tree-sha1 = "b4fdad5fe06e0226348301b5163925ac1ae8b64b"
+git-tree-sha1 = "cfb694feaddf4f0381ef3cc9d4c0d8fc6b7e2ea7"
 uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-version = "1.6.5"
+version = "1.9.0"
 
 [[FillArrays]]
 deps = ["LinearAlgebra", "Random", "SparseArrays"]
@@ -268,9 +267,9 @@ version = "0.4.2"
 
 [[FreeType]]
 deps = ["CEnum", "FreeType2_jll"]
-git-tree-sha1 = "d5e296dea44f9cfb8cc83681aa3db367e0cbfd4f"
+git-tree-sha1 = "cabd77ab6a6fdff49bfd24af2ebe76e6e018a2b4"
 uuid = "b38be410-82b0-50bf-ab77-7b57e271db43"
-version = "3.0.1"
+version = "4.0.0"
 
 [[FreeType2_jll]]
 deps = ["Artifacts", "Bzip2_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
@@ -280,21 +279,21 @@ version = "2.10.1+5"
 
 [[FreeTypeAbstraction]]
 deps = ["ColorVectorSpace", "Colors", "FreeType", "GeometryBasics", "StaticArrays"]
-git-tree-sha1 = "3d955cfbefd6645ced60091d8c9bfcc96fc32345"
+git-tree-sha1 = "d51e69f0a2f8a3842bca4183b700cf3d9acce626"
 uuid = "663a7486-cb36-511b-a19d-713bb74d65c9"
-version = "0.8.4"
+version = "0.9.1"
 
 [[FriBidi_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "0d20aed5b14dd4c9a2453c1b601d08e1149679cc"
+git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91"
 uuid = "559328eb-81f9-559d-9380-de523a88c83c"
-version = "1.0.5+6"
+version = "1.0.10+0"
 
 [[Functors]]
 deps = ["MacroTools"]
-git-tree-sha1 = "f40adc6422f548176bb4351ebd29e4abf773040a"
+git-tree-sha1 = "a7bb2af991c43dcf5c3455d276dd83976799634f"
 uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
-version = "0.1.0"
+version = "0.2.1"
 
 [[GeometryBasics]]
 deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"]
@@ -322,9 +321,9 @@ version = "1.1.0"
 
 [[Graphite2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "42adbc6fd39ba41138f894b8ac711146a2b0d986"
+git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011"
 uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472"
-version = "1.3.13+4"
+version = "1.3.14+0"
 
 [[GridLayoutBase]]
 deps = ["GeometryBasics", "InteractiveUtils", "Match", "Observables"]
@@ -333,9 +332,9 @@ uuid = "3955a311-db13-416c-9275-1d80ed98e5e9"
 version = "0.5.4"
 
 [[Grisu]]
-git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995"
+git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2"
 uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe"
-version = "1.0.0"
+version = "1.0.2"
 
 [[HarfBuzz_jll]]
 deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Gettext_jll", "Glib_jll", "Graphite2_jll", "ICU_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"]
@@ -361,16 +360,16 @@ uuid = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 version = "0.1.0"
 
 [[ImageCore]]
-deps = ["AbstractFFTs", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"]
-git-tree-sha1 = "da98af44e78a2a9dd131ac12cf19b574f551dace"
+deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"]
+git-tree-sha1 = "8aa4a5c9b0b0a0fea9cac59549222078e375b867"
 uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534"
-version = "0.8.21"
+version = "0.9.0"
 
 [[ImageIO]]
 deps = ["FileIO", "Netpbm", "PNGFiles", "TiffImages", "UUIDs"]
-git-tree-sha1 = "015adb094b2d81167821df8a24c180a8eee22f2c"
+git-tree-sha1 = "d444375fd1e45153fe339c259da8bf98eb5130d6"
 uuid = "82e4d734-157c-48bb-816b-45c225c6df19"
-version = "0.5.3"
+version = "0.5.4"
 
 [[IndirectArrays]]
 git-tree-sha1 = "c2a145a145dc03a7620af1444e0264ef907bd44f"
@@ -389,9 +388,9 @@ uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 
 [[Interpolations]]
 deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"]
-git-tree-sha1 = "eb1dd6d5b2275faaaa18533e0fc5f9171cec25fa"
+git-tree-sha1 = "1e0e51692a3a77f1eeb51bf741bdd0439ed210e7"
 uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
-version = "0.13.1"
+version = "0.13.2"
 
 [[IntervalSets]]
 deps = ["Dates", "EllipsisNotation", "Statistics"]
@@ -416,9 +415,10 @@ uuid = "82899510-4779-5014-852e-03e436cf321d"
 version = "1.0.0"
 
 [[JLLWrappers]]
-git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0"
+deps = ["Preferences"]
+git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e"
 uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
-version = "1.2.0"
+version = "1.3.0"
 
 [[JSON]]
 deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -428,15 +428,15 @@ version = "0.21.1"
 
 [[KernelDensity]]
 deps = ["Distributions", "DocStringExtensions", "FFTW", "Interpolations", "StatsBase"]
-git-tree-sha1 = "09aeec87bdc9c1fa70d0b508dfa94a21acd280d9"
+git-tree-sha1 = "591e8dc09ad18386189610acafb970032c519707"
 uuid = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b"
-version = "0.6.2"
+version = "0.6.3"
 
 [[KernelFunctions]]
-deps = ["ChainRulesCore", "Compat", "Distances", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"]
-git-tree-sha1 = "c1ae17a1acbb80a847927b69a2a4b1ea087f45f9"
+deps = ["ChainRulesCore", "Compat", "CompositionsBase", "Distances", "FillArrays", "Functors", "LinearAlgebra", "Random", "Requires", "SpecialFunctions", "StatsBase", "StatsFuns", "TensorCore", "Test", "ZygoteRules"]
+git-tree-sha1 = "3c10a95f9ddd3f7b5c3ef462c2cb75bc58ec5b18"
 uuid = "ec8451be-7e33-11e9-00cf-bbf324bd1392"
-version = "0.9.1"
+version = "0.10.0"
 
 [[LAME_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -446,9 +446,9 @@ version = "3.100.0+3"
 
 [[LZO_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "f128cd6cd05ffd6d3df0523ed99b90ff6f9b349a"
+git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6"
 uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac"
-version = "2.10.0+3"
+version = "2.10.1+0"
 
 [[LazyArtifacts]]
 deps = ["Artifacts", "Pkg"]
@@ -481,44 +481,50 @@ uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [[Libffi_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "a2cd088a88c0d37eef7d209fd3d8712febce0d90"
+git-tree-sha1 = "761a393aeccd6aa92ec3515e428c26bf99575b3b"
 uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490"
-version = "3.2.1+4"
+version = "3.2.2+0"
 
 [[Libgcrypt_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"]
-git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999"
+git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae"
 uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4"
-version = "1.8.5+4"
+version = "1.8.7+0"
 
 [[Libgpg_error_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7"
+git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9"
 uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8"
-version = "1.36.0+3"
+version = "1.42.0+0"
 
 [[Libiconv_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f"
+git-tree-sha1 = "8d22e127ea9a0917bc98ebd3755c8bd31989381e"
 uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
-version = "1.16.0+7"
+version = "1.16.1+0"
 
 [[Libmount_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "51ad0c01c94c1ce48d5cad629425035ad030bfd5"
+git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73"
 uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9"
-version = "2.34.0+3"
+version = "2.35.0+0"
 
 [[Libuuid_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "f879ae9edbaa2c74c922e8b85bb83cc84ea1450b"
+git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066"
 uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700"
-version = "2.34.0+7"
+version = "2.36.0+0"
 
 [[LinearAlgebra]]
 deps = ["Libdl"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
+[[LogExpFunctions]]
+deps = ["DocStringExtensions", "LinearAlgebra"]
+git-tree-sha1 = "1ba664552f1ef15325e68dc4c05c3ef8c2d5d885"
+uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
+version = "0.2.4"
+
 [[Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
@@ -534,11 +540,16 @@ git-tree-sha1 = "6a8a2a625ab0dea913aba95c11370589e0239ff0"
 uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 version = "0.5.6"
 
+[[Makie]]
+deps = ["Animations", "Artifacts", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Distributions", "DocStringExtensions", "FFMPEG", "FileIO", "FixedPointNumbers", "Formatting", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "IntervalSets", "Isoband", "KernelDensity", "LinearAlgebra", "Markdown", "Match", "Observables", "Packing", "PlotUtils", "PolygonOps", "Printf", "Random", "Serialization", "Showoff", "SignedDistanceFields", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "UnicodeFun"]
+git-tree-sha1 = "a53666e191176542dbd75b0b84cd24eb58e898d8"
+uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
+version = "0.13.6"
+
 [[MappedArrays]]
-deps = ["FixedPointNumbers"]
-git-tree-sha1 = "b92bd220c95a8bbe89af28f11201fd080e0e3fe7"
+git-tree-sha1 = "18d3584eebc861e311a552cbb67723af8edff5de"
 uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
-version = "0.3.0"
+version = "0.4.0"
 
 [[Markdown]]
 deps = ["Base64"]
@@ -555,18 +566,18 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
 
 [[Missings]]
 deps = ["DataAPI"]
-git-tree-sha1 = "f8c673ccc215eb50fcadb285f522420e29e69e1c"
+git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7"
 uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
-version = "0.4.5"
+version = "1.0.0"
 
 [[Mmap]]
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[MosaicViews]]
-deps = ["MappedArrays", "OffsetArrays", "PaddedViews"]
-git-tree-sha1 = "614e8d77264d20c1db83661daadfab38e8e4b77e"
+deps = ["MappedArrays", "OffsetArrays", "PaddedViews", "StackViews"]
+git-tree-sha1 = "b34e3bc3ca7c94914418637cb10cc4d1d80d877d"
 uuid = "e94cdb99-869f-56ef-bcf0-1ae2bcbe0389"
-version = "0.2.4"
+version = "0.3.3"
 
 [[MozillaCACerts_jll]]
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
@@ -577,10 +588,10 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
 version = "0.3.5"
 
 [[Netpbm]]
-deps = ["ColorVectorSpace", "FileIO", "ImageCore"]
-git-tree-sha1 = "03472ec5ea8884b791c6340712f3261c0f393691"
+deps = ["FileIO", "ImageCore"]
+git-tree-sha1 = "18efc06f6ec36a8b801b23f076e3c6ac7c3bf153"
 uuid = "f09324ee-3d7c-5217-9330-fc30815ba969"
-version = "1.0.0"
+version = "1.0.2"
 
 [[NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -592,9 +603,9 @@ version = "0.4.0"
 
 [[OffsetArrays]]
 deps = ["Adapt"]
-git-tree-sha1 = "b3dfef5f2be7d7eb0e782ba9146a5271ee426e90"
+git-tree-sha1 = "c3a3d8d45fb533e88e3ab97748d40ee85711d988"
 uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-version = "1.6.2"
+version = "1.9.0"
 
 [[Ogg_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -610,9 +621,9 @@ version = "1.1.1+6"
 
 [[OpenSpecFun_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3"
+git-tree-sha1 = "b9b8b8ed236998f91143938a760c2112dceeb2b4"
 uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e"
-version = "0.5.3+4"
+version = "0.5.4+0"
 
 [[Opus_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
@@ -621,15 +632,15 @@ uuid = "91d4177d-7536-5919-b921-800302f37372"
 version = "1.3.1+3"
 
 [[OrderedCollections]]
-git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf"
+git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
 uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
-version = "1.4.0"
+version = "1.4.1"
 
 [[PCRE_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "1b556ad51dceefdbf30e86ffa8f528b73c7df2bb"
+git-tree-sha1 = "b2a7af664e098055a7529ad1a900ded962bca488"
 uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc"
-version = "8.42.0+4"
+version = "8.44.0+0"
 
 [[PDMats]]
 deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
@@ -639,9 +650,9 @@ version = "0.11.0"
 
 [[PNGFiles]]
 deps = ["Base64", "CEnum", "ImageCore", "IndirectArrays", "OffsetArrays", "libpng_jll"]
-git-tree-sha1 = "28f9667d6ca9168b7198a481847f0879e6c72ef1"
+git-tree-sha1 = "520e28d4026d16dcf7b8c8140a3041f0e20a9ca8"
 uuid = "f57f5aa1-a3ce-4bc8-8ab9-96f992907883"
-version = "0.3.6"
+version = "0.3.7"
 
 [[Packing]]
 deps = ["GeometryBasics"]
@@ -669,9 +680,9 @@ version = "1.1.0"
 
 [[Pixman_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
-git-tree-sha1 = "6a20a83c1ae86416f0a5de605eaea08a552844a3"
+git-tree-sha1 = "b4f5d02549a10e20780a24fce72bea96b6329e29"
 uuid = "30392449-352a-5448-841d-b1acce4e97dc"
-version = "0.40.0+0"
+version = "0.40.1+0"
 
 [[Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
@@ -694,15 +705,21 @@ git-tree-sha1 = "c031d2332c9a8e1c90eca239385815dc271abb22"
 uuid = "647866c9-e3ac-4575-94e7-e3d426903924"
 version = "0.1.1"
 
+[[Preferences]]
+deps = ["TOML"]
+git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a"
+uuid = "21216c6a-2e73-6563-6e65-726566657250"
+version = "1.2.2"
+
 [[Printf]]
 deps = ["Unicode"]
 uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [[ProgressMeter]]
 deps = ["Distributed", "Printf"]
-git-tree-sha1 = "6e9c89cba09f6ef134b00e10625590746ba1e036"
+git-tree-sha1 = "1be8800271c86f572d334fef6e3b8364eaece7d9"
 uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
-version = "1.5.0"
+version = "1.6.2"
 
 [[QuadGK]]
 deps = ["DataStructures", "LinearAlgebra"]
@@ -763,9 +780,9 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
 
 [[Showoff]]
 deps = ["Dates", "Grisu"]
-git-tree-sha1 = "236dd0ddad6e3764cce8d8b09c0bbba6df2e194f"
+git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de"
 uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
-version = "1.0.2"
+version = "1.0.3"
 
 [[SignedDistanceFields]]
 deps = ["Random", "Statistics", "Test"]
@@ -777,20 +794,26 @@ version = "0.4.0"
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
 [[SortingAlgorithms]]
-deps = ["DataStructures", "Random", "Test"]
-git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd"
+deps = ["DataStructures"]
+git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96"
 uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
-version = "0.3.1"
+version = "1.0.0"
 
 [[SparseArrays]]
 deps = ["LinearAlgebra", "Random"]
 uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[SpecialFunctions]]
-deps = ["ChainRulesCore", "OpenSpecFun_jll"]
-git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902"
+deps = ["ChainRulesCore", "LogExpFunctions", "OpenSpecFun_jll"]
+git-tree-sha1 = "371204984184315ed7228bcc604d08e1bbc18f31"
 uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
-version = "1.3.0"
+version = "1.4.2"
+
+[[StackViews]]
+deps = ["OffsetArrays"]
+git-tree-sha1 = "46e589465204cd0c08b4bd97385e4fa79a0c770c"
+uuid = "cae243ae-269e-4f55-b966-ac2d0dc13c15"
+version = "0.1.1"
 
 [[Static]]
 deps = ["IfElse"]
@@ -800,25 +823,30 @@ version = "0.2.4"
 
 [[StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "2f01a51c23eed210ff4a1be102c4cc8236b66e5b"
+git-tree-sha1 = "a1f226ebe197578c25fcf948bfff3d0d12f2ff20"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.1.0"
+version = "1.2.1"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
+[[StatsAPI]]
+git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510"
+uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
+version = "1.0.0"
+
 [[StatsBase]]
-deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
-git-tree-sha1 = "4bc58880426274277a066de306ef19ecc22a6863"
+deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
+git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.33.5"
+version = "0.33.8"
 
 [[StatsFuns]]
-deps = ["Rmath", "SpecialFunctions"]
-git-tree-sha1 = "ced55fd4bae008a8ea12508314e725df61f0ba45"
+deps = ["LogExpFunctions", "Rmath", "SpecialFunctions"]
+git-tree-sha1 = "30cd8c360c54081f806b1ee14d2eecbef3c04c49"
 uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
-version = "0.9.7"
+version = "0.9.8"
 
 [[StructArrays]]
 deps = ["Adapt", "DataAPI", "Tables"]
@@ -842,9 +870,9 @@ version = "1.0.1"
 
 [[Tables]]
 deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
-git-tree-sha1 = "a9ff3dfec713c6677af435d6a6d65f9744feef67"
+git-tree-sha1 = "aa30f8bb63f9ff3f8303a06c604c8500a69aa791"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "1.4.1"
+version = "1.4.3"
 
 [[Tar]]
 deps = ["ArgTools", "SHA"]
@@ -862,9 +890,9 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [[TiffImages]]
 deps = ["ColorTypes", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "OffsetArrays", "OrderedCollections", "PkgVersion", "ProgressMeter"]
-git-tree-sha1 = "94d7c4d760d552a90a98a7150c4a32c7be25e4ee"
+git-tree-sha1 = "af30d22cc2cdda1848821135bfb04ebd657005a2"
 uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69"
-version = "0.3.0"
+version = "0.3.2"
 
 [[UUIDs]]
 deps = ["Random", "SHA"]
@@ -887,15 +915,15 @@ version = "0.5.3"
 
 [[XML2_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "afd2b541e8fd425cd3b7aa55932a257035ab4a70"
+git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a"
 uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
-version = "2.9.11+0"
+version = "2.9.12+0"
 
 [[XSLT_jll]]
-deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"]
-git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497"
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"]
+git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a"
 uuid = "aed1982a-8fda-507f-9586-7b0439959a61"
-version = "1.1.33+4"
+version = "1.1.34+0"
 
 [[Xorg_libX11_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"]
@@ -975,9 +1003,9 @@ version = "0.1.6+4"
 
 [[libpng_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"]
-git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee"
+git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c"
 uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f"
-version = "1.6.37+6"
+version = "1.6.38+0"
 
 [[libvorbis_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"]
diff --git a/docs/Project.toml b/docs/Project.toml
index 3d3898b..1fbb1c3 100644
--- a/docs/Project.toml
+++ b/docs/Project.toml
@@ -5,5 +5,5 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 
 [compat]
 AbstractGPs = "0.3"
-CairoMakie = "0.4"
+CairoMakie = "0.5"
 Documenter = "0.26"
diff --git a/docs/src/api.md b/docs/src/api.md
index 9323af3..c300a79 100644
--- a/docs/src/api.md
+++ b/docs/src/api.md
@@ -17,7 +17,7 @@ Random.seed!(1) # hide
 x = 1:10
 y = rand(10)
 Δy = rand(10)
-symband(x, y, Δy; color=:blue, bandcolor=(:blue, 0.3), bandscale=2.5)
+symband(x, y, Δy; color=(:blue, 0.3), bandscale=2.5)
 save("symband_example.svg", current_figure()); nothing # hide
 ```
 
diff --git a/docs/src/index.md b/docs/src/index.md
index 4776b17..6d0556f 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -22,9 +22,13 @@ using CairoMakie
 We load a custom set of colors and globally set the x-axis limits.
 
 ```@example quickstart
-using CairoMakie.AbstractPlotting.ColorSchemes: Set1_4
+using CairoMakie.Makie.ColorSchemes: Set1_4
 
-set_theme!(Theme(Axis=(limits=((0, 10), nothing),)))
+set_theme!(
+    palette=(color=Set1_4,),
+    patchcolor=(Set1_4[2], 0.2),
+    Axis=(limits=((0, 10), nothing),),
+)
 ```
 
 We perform a simple Gaussian process (GP) regression with
@@ -50,7 +54,7 @@ x = 10 .* rand(10)
 gpx = gp(x, 0.01)
 y = rand(gpx)
 
-scatter(x, y; color=Set1_4[1])
+scatter(x, y)
 save("data.svg", current_figure()); nothing # hide
 ```
 
@@ -70,8 +74,8 @@ the plot.
 ```@example quickstart
 using AbstractGPsMakie
 
-plot(0:0.01:10, posterior_gp; bandscale=3, color=Set1_4[2], bandcolor=(Set1_4[2], 0.2))
-scatter!(x, y; color=Set1_4[1])
+plot(0:0.01:10, posterior_gp; bandscale=3)
+scatter!(x, y)
 save("posterior.svg", current_figure()); nothing # hide
 ```
 
@@ -80,9 +84,9 @@ save("posterior.svg", current_figure()); nothing # hide
 We add 10 samples from the posterior on top.
 
 ```@example quickstart
-plot(0:0.01:10, posterior_gp; bandscale=3, color=Set1_4[2], bandcolor=(Set1_4[2], 0.2))
+plot(0:0.01:10, posterior_gp; bandscale=3)
 gpsample!(0:0.01:10, posterior_gp; samples=10, color=Set1_4[3])
-scatter!(x, y; color=Set1_4[1])
+scatter!(x, y)
 save("posterior_samples.svg", current_figure()); nothing # hide
 ```
 
@@ -91,12 +95,9 @@ save("posterior_samples.svg", current_figure()); nothing # hide
 We can visualize a manifold of similar samples by animating the generated samples.[^PH2013]
 
 ```@example quickstart
-scene = plot(
-    0:0.01:10, posterior_gp;
-    bandscale=3, color=Set1_4[2], bandcolor=(Set1_4[2], 0.2),
-)
+scene = plot(0:0.01:10, posterior_gp; bandscale=3)
 samples = gpsample!(0:0.01:10, posterior_gp; samples=10, color=Set1_4[3])
-scatter!(x, y; color=Set1_4[1])
+scatter!(x, y)
 
 record(scene, "posterior_animation.mp4", 0:0.01:4) do x
     samples.orbit[] = x
diff --git a/src/AbstractGPsMakie.jl b/src/AbstractGPsMakie.jl
index 782c49c..c1c3c13 100644
--- a/src/AbstractGPsMakie.jl
+++ b/src/AbstractGPsMakie.jl
@@ -2,7 +2,7 @@ module AbstractGPsMakie
 
 using AbstractGPs
 using LinearAlgebra
-using AbstractPlotting
+using Makie
 
 using AbstractGPs: AbstractGP, FiniteGP
 
@@ -14,8 +14,8 @@ include(joinpath("recipes", "gpsample.jl"))
 include("conversions.jl")
 
 # default plot type
-AbstractPlotting.plottype(::AbstractVector, ::FiniteGP) = SymBand
-AbstractPlotting.plottype(::FiniteGP) = SymBand
-AbstractPlotting.plottype(::AbstractVector, ::AbstractGP) = SymBand
+Makie.plottype(::AbstractVector, ::FiniteGP) = SymBand
+Makie.plottype(::FiniteGP) = SymBand
+Makie.plottype(::AbstractVector, ::AbstractGP) = SymBand
 
 end
diff --git a/src/conversions.jl b/src/conversions.jl
index a78b90a..9adf897 100644
--- a/src/conversions.jl
+++ b/src/conversions.jl
@@ -1,5 +1,5 @@
 # `SymBand` for `FiniteGP`
-function AbstractPlotting.convert_arguments(
+function Makie.convert_arguments(
     ::Type{P}, x::AbstractVector, gp::FiniteGP
 ) where {P<:SymBand}
     y, var = mean_and_var(gp)
@@ -8,36 +8,29 @@ function AbstractPlotting.convert_arguments(
 end
 
 # `GPSample` for `FiniteGP`
-function AbstractPlotting.convert_arguments(
-    ::Type{<:GPSample}, x::AbstractVector, gp::FiniteGP
-)
-    return (x, gp)
-end
+Makie.convert_arguments(::Type{<:GPSample}, x::AbstractVector, gp::FiniteGP) = (x, gp)
 
 # Default fallback: plot mean of GP
-function AbstractPlotting.convert_arguments(
-    P::AbstractPlotting.PlotFunc, x::AbstractVector, gp::FiniteGP
-)
+function Makie.convert_arguments(P::Makie.PlotFunc, x::AbstractVector, gp::FiniteGP)
     return convert_arguments(P, x, mean(gp))
 end
 
-# Fallback for `band`/`band!`: plot band of 3 SD around mean of GP
-# attributes not available, therefore no scaling possible :(
-# https://github.com/JuliaPlots/Makie.jl/issues/837
-function AbstractPlotting.convert_arguments(
-    ::Type{P}, x::AbstractVector, gp::FiniteGP
-) where {P<:Band}
+# `Band` with scaling for `FiniteGP`
+Makie.used_attributes(::Type{<:Band}, ::AbstractVector, ::FiniteGP) = (:bandscale,)
+function Makie.convert_arguments(
+    ::Type{<:Band}, x::AbstractVector, gp::FiniteGP; bandscale=1
+)
     y, var = mean_and_var(gp)
-    scale = 3
-    return (Point2f0.(x, y .- scale .* sqrt.(var)), Point2f0.(x, y .+ scale .* sqrt.(var)))
+    Δy = bandscale .* sqrt.(var)
+    return (Point2f0.(x, y .- Δy), Point2f0.(x, y .+ Δy))
 end
 
 # default conversions for `FiniteGP` and `AbstractGP`
-function AbstractPlotting.convert_arguments(
-    P::AbstractPlotting.PlotFunc, x::AbstractVector, gp::AbstractGPs.AbstractGP
+function Makie.convert_arguments(
+    P::Makie.PlotFunc, x::AbstractVector, gp::AbstractGPs.AbstractGP
 )
     return convert_arguments(P, gp(x, 1e-9))
 end
-function AbstractPlotting.convert_arguments(P::AbstractPlotting.PlotFunc, gp::FiniteGP)
+function Makie.convert_arguments(P::Makie.PlotFunc, gp::FiniteGP)
     return convert_arguments(P, gp.x, gp)
 end
diff --git a/src/recipes/gpsample.jl b/src/recipes/gpsample.jl
index f41feb8..8df8e98 100644
--- a/src/recipes/gpsample.jl
+++ b/src/recipes/gpsample.jl
@@ -11,20 +11,21 @@ correspond to angles in ``[0, 2\\pi)`` on the great circle of samples.
 
 ## Attributes
 
-$(AbstractPlotting.ATTRIBUTES)
+$(Makie.ATTRIBUTES)
 
 [^PH2013]: Philipp Hennig (2013). [Animating Samples from Gaussian Distributions](http://mlss.tuebingen.mpg.de/2013/2013/Hennig_2013_Animating_Samples_from_Gaussian_Distributions.pdf). Technical Report No. 8 of the Max Planck Institute for Intelligent Systems.
 """
 @recipe(GPSample, x, gp) do scene
-    l_theme = default_theme(scene, Lines)
     Attributes(;
-        color=l_theme.color,
-        colormap=l_theme.colormap,
-        colorrange=get(l_theme.attributes, :colorrange, AbstractPlotting.automatic),
-        linestyle=l_theme.linestyle,
-        linewidth=l_theme.linewidth,
+        color=theme(scene, :linecolor),
+        colormap=theme(scene, :colormap),
+        colorrange=Makie.automatic,
+        linestyle=theme(scene, :linestyle),
+        linewidth=theme(scene, :linewidth),
         samples=Node(1),
         orbit=Node(0.0),
+        cycle=[:color],
+        inspectable=theme(scene, :inspectable),
     )
 end
 
@@ -35,7 +36,7 @@ Plot sample(s) from the finite projection `gp(x, 1e-9)` along `x`.
 """
 gpsample(::AbstractVector, ::AbstractGP; kwargs...)
 
-function AbstractPlotting.plot!(plot::GPSample)
+function Makie.plot!(plot::GPSample)
     @extract plot (x, gp)
 
     # Compute mean of the GP and the Cholesky decomposition of its covariance matrix
@@ -102,6 +103,7 @@ function AbstractPlotting.plot!(plot::GPSample)
         linewidth=plot.linewidth,
         colormap=plot.colormap,
         colorrange=plot.colorrange,
+        inspectable=plot.inspectable,
     )
 
     return plot
diff --git a/src/recipes/symband.jl b/src/recipes/symband.jl
index f16b2cc..9d1c690 100644
--- a/src/recipes/symband.jl
+++ b/src/recipes/symband.jl
@@ -6,25 +6,23 @@ Plot a symmetric band of radius `bandscale * Δy` around `(x, y)`.
 
 ## Attributes
 
-$(AbstractPlotting.ATTRIBUTES)
+$(Makie.ATTRIBUTES)
 """
 @recipe(SymBand, xy, Δy) do scene
-    b_theme = default_theme(scene, Band)
-    l_theme = default_theme(scene, Lines)
     Attributes(;
-        color=l_theme.color,
-        colormap=l_theme.colormap,
-        colorrange=get(l_theme.attributes, :colorrange, AbstractPlotting.automatic),
-        linestyle=l_theme.linestyle,
-        linewidth=l_theme.linewidth,
-        bandcolor=b_theme.color,
-        bandcolormap=b_theme.colormap,
-        bandcolorrange=b_theme.colorrange,
         bandscale=Node(1.0),
+        color=theme(scene, :patchcolor),
+        colormap=theme(scene, :colormap),
+        colorrange=Makie.automatic,
+        linecolor=Makie.automatic,
+        linestyle=theme(scene, :linestyle),
+        linewidth=theme(scene, :linewidth),
+        cycle=[:color => :patchcolor],
+        inspectable=theme(scene, :inspectable),
     )
 end
 
-function AbstractPlotting.plot!(plot::SymBand)
+function Makie.plot!(plot::SymBand)
     @extract plot (xy, Δy)
     lower_upper = lift(xy, Δy, plot.bandscale) do xy, Δy, scale
         return (
@@ -35,18 +33,24 @@ function AbstractPlotting.plot!(plot::SymBand)
     lower = lift(first, lower_upper)
     upper = lift(last, lower_upper)
 
+    linecolor = lift(plot.color, plot.linecolor) do color, linecolor
+        linecolor === Makie.automatic || return linecolor
+        c = to_color(color)
+        return Makie.RGB(Makie.red(c), Makie.green(c), Makie.blue(c))
+    end
+
     band!(
         plot,
         lower,
         upper;
-        color=plot.bandcolor,
-        colormap=plot.bandcolormap,
-        colorrange=plot.bandcolorrange,
+        color=plot.color,
+        colormap=plot.colormap,
+        colorrange=plot.colorrange,
     )
     lines!(
         plot,
         xy;
-        color=plot.color,
+        color=linecolor,
         linestyle=plot.linestyle,
         linewidth=plot.linewidth,
         colormap=plot.colormap,
@@ -56,4 +60,4 @@ function AbstractPlotting.plot!(plot::SymBand)
     return plot
 end
 
-AbstractPlotting.convert_arguments(::Type{<:SymBand}, x, y, Δy) = (map(Point2f0, x, y), Δy)
+Makie.convert_arguments(::Type{<:SymBand}, x, y, Δy) = (map(Point2f0, x, y), Δy)
diff --git a/test/Project.toml b/test/Project.toml
index 7bc8ae7..e3a27c0 100644
--- a/test/Project.toml
+++ b/test/Project.toml
@@ -1,10 +1,10 @@
 [deps]
 AbstractGPs = "99985d1d-32ba-4be9-9821-2ec096f28918"
-AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e"
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
 AbstractGPs = "0.3"
-AbstractPlotting = "0.17.1, 0.18"
+Makie = "0.13"
 julia = "1.3"
diff --git a/test/conversions.jl b/test/conversions.jl
index 652a497..018794e 100644
--- a/test/conversions.jl
+++ b/test/conversions.jl
@@ -17,10 +17,15 @@
     end
 
     # Fallback for `Band`
-    lower = mu .- 3 .* sqrt.(var)
-    upper = mu .+ 3 .* sqrt.(var)
+    lower = mu .- sqrt.(var)
+    upper = mu .+ sqrt.(var)
     @test convert_arguments(Band, z, f) ==
           (map(Point2f0, z, lower), map(Point2f0, z, upper))
+    scale = rand()
+    lower = mu .- scale .* sqrt.(var)
+    upper = mu .+ scale .* sqrt.(var)
+    @test convert_arguments(Band, z, f; bandscale=scale) ==
+          (map(Point2f0, z, lower), map(Point2f0, z, upper))
 
     # Fallback for `AbstractGP` and `FiniteGP`
     for P in (Lines, LineSegments, Scatter, Band, SymBand, GPSample)
diff --git a/test/runtests.jl b/test/runtests.jl
index dcaca9f..9b3710f 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,6 +1,6 @@
 using AbstractGPsMakie
 using AbstractGPs
-using AbstractPlotting
+using Makie
 using Random
 using Test