Merge pull request #2469 from JuliaPlots/bbs/remove-defaults

remove default recipes
move Volume
2020-03-16 22:48:38 +01:00 · 2020-03-15 21:48:51 +01:00 · 2020-03-15 21:22:59 +01:00 · 2020-03-15 21:14:16 +01:00 · 2020-03-15 18:11:46 +01:00 · 2020-03-15 16:53:54 +01:00
43 changed files with 2489 additions and 2234 deletions
@@ -1,32 +0,0 @@
---
-name: Bug report
-about: Create a bug report
-title: "[BUG]"
-labels: bug
-assignees: ''
-
---
-
-Please search existing issues to avoid duplicates.
-
-## Details
-
-
-### Backends
-
-This bug occurs on ( insert `x` below )
-
-Backend      | yes | no  | untested
-------------|-----|-----|---------
-gr (default) |     |     |
-pyplot       |     |     |
-plotly       |     |     |
-plotlyjs     |     |     |
-pgfplotsx    |     |     |
-inspectdr    |     |     |
-
-### Versions
-
-Plots.jl version:
-Backend  version:
-Output of `versioninfo()`:
@@ -1,10 +0,0 @@
---
-name: Feature request
-about: Suggest a feature or enhancement
-title: "[FR]"
-labels: feature request
-assignees: ''
-
---
-
-Please search existing issues to avoid duplicates.
@@ -8,5 +8,3 @@ deps/plotly-latest.min.js
 deps/build.log
 deps/deps.jl
 Manifest.toml
-dev/
-test/tmpplotsave.hdf5
@@ -4,8 +4,8 @@ os:
  - linux
  # - osx
 julia:
-  - 1.0
  - 1
+  - 1.3
  - nightly

 matrix:
@@ -20,9 +20,6 @@ addons:
      - xauth
      - xvfb

-env:
-  - GKS_ENCODING="utf8"
-
 cache:
  directories:
  - $HOME/.julia/artifacts
@@ -35,10 +32,7 @@ before_install:
 notifications:
  email: true

-after_success:
-  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
-
 script:
  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
  - if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
-  - $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'
+  - $TESTCMD -e 'using Pkg; pkg"add https://github.com/mkborregaard/RecipeUtils.jl"; Pkg.build(); Pkg.test(coverage=true)'
@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.1.2"
+version = "0.29.7"

 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -21,8 +21,8 @@ PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+RecipePipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-RecipesPipeline = "01d81517-befc-4cb6-b9ec-a95719d0359c"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
@@ -34,40 +34,37 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 Contour = "0.5"
 FFMPEG = "0.2, 0.3"
-FixedPointNumbers = "0.6, 0.7, 0.8"
+FixedPointNumbers = "0.6, 0.7"
 GR = "0.46, 0.47, 0.48"
 GeometryTypes = "0.7, 0.8"
 JSON = "0.21"
 Measures = "0.3"
 NaNMath = "0.3"
 PGFPlotsX = "1.2.0"
-PlotThemes = "2"
-PlotUtils = "1"
-RecipesBase = "1"
-RecipesPipeline = "0.1.3"
+PlotThemes = "1"
+PlotUtils = "0.6.1"
+RecipesBase = "0.8"
 Reexport = "0.2"
-Requires = "0.5, 1"
+Requires = "0.5, 1.0"
 Showoff = "0.3.1"
-StatsBase = "0.32, 0.33"
+StatsBase = "0.32"
 julia = "1"

 [extras]
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
-HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
 ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
+LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
-OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"

 [targets]
-test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LibGit2", "OffsetArrays", "PGFPlotsX", "HDF5", "Random", "RDatasets", "StaticArrays", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
+test = ["FileIO", "GeometryTypes", "Gtk", "ImageMagick", "Images", "LaTeXStrings", "LibGit2", "PGFPlotsX", "Random", "RDatasets", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
@@ -20,7 +20,6 @@
 [![][pkgeval-img]][pkgeval-url]
 [![][gitter-img]][gitter-url]
 [![][docs-img]][docs-url]
-[![Codecov](https://codecov.io/gh/JuliaPlots/Plots.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaPlots/Plots.jl)

 #### Created by Tom Breloff (@tbreloff)

@@ -1,7 +1,8 @@
 environment:
  matrix:
-  - julia_version: 1.0
+  # - julia_version: 0.7
  - julia_version: 1
+  - julia_version: 1.3
  - julia_version: nightly

 platform:
@@ -32,7 +33,7 @@ install:
  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))

 build_script:
-  - echo "%JL_TEST_SCRIPT%"
+  - echo "%JL_BUILD_SCRIPT%"
  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

 test_script:
@@ -1,10 +0,0 @@
-ignore:
-  - "src/backends/inspectdr.jl"
-  - "src/backends/orca.jl"
-  - "src/backends/pgfplots.jl"
-  - "src/backends/plotly.jl"
-  - "src/backends/plotlyjs.jl"
-  - "src/backends/pyplot.jl"
-  - "src/backends/web.jl"
-  - "src/fileio.jl"
-  - "src/ijulia.jl"
@@ -26,15 +26,13 @@

 using SnoopCompile

-project_flag = string("--project=", joinpath(homedir(), ".julia", "dev", "Plots"))
 log_path = joinpath(tempdir(), "compiles.log")
 precompiles_path = joinpath(tempdir(), "precompile")

 # run examples with GR backend, logging what needs to be compiled
-SnoopCompile.@snoopc project_flag log_path begin
+SnoopCompile.@snoopc log_path begin
    using Plots
-    Plots.test_examples(:gr)
-    Plots.test_examples(:plotly, skip = Plots._backend_skips[:plotly])
+    Plots.test_examples(:gr, disp=true)
 end

 # precompile calls containing the following strings are dropped
@@ -44,9 +42,7 @@ blacklist = [
    # the following are not visible to Plots, only its dependencies
    "CategoricalArrays",
    "FixedPointNumbers",
-    "OffsetArrays",
    "SparseArrays",
-    "StaticArrays",
    r"#{1,2}[^\"#]+#{1,2}\d+",
 ]

@@ -1,9 +1,5 @@
 module Plots

-if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
-    @eval Base.Experimental.@optlevel 1
-end
-
 const _current_plots_version = VersionNumber(split(first(filter(line -> occursin("version", line), readlines(normpath(@__DIR__, "..", "Project.toml")))), "\"")[2])

 using Reexport
@@ -22,6 +18,31 @@ using Base.Meta
 import Showoff
 import StatsBase
 import JSON
+import RecipePipeline:
+    _process_userrecipe,
+    _process_plotrecipe,
+    _process_seriesrecipe,
+    _preprocess_args,
+    preprocessArgs!,
+    is_st_supported,
+    finalize_subplot!,
+    recipe_pipeline!,
+    _recipe_init!,
+    _recipe_after_user!,
+    _recipe_after_plot!,
+    _recipe_before_series!,
+    _recipe_finish!,
+    is_st_supported,
+    Formatted,
+    SliceIt,
+    FuncOrFuncs,
+    MaybeNumber,
+    MaybeString,
+    DataPoint,
+    trueOrAllTrue,
+    Surface,
+    AbstractSurface,
+    Volume

 using Requires

@@ -167,26 +188,6 @@ using .PlotMeasures
 import .PlotMeasures: Length, AbsoluteLength, Measure, width, height
 # ---------------------------------------------------------

-import RecipesPipeline
-import RecipesPipeline: SliceIt,
-    DefaultsDict,
-    Formatted,
-    AbstractSurface,
-    Surface,
-    Volume,
-    is3d,
-    is_surface,
-    needs_3d_axes,
-    group_as_matrix, # for StatsPlots
-    reset_kw!,
-    pop_kw!,
-    scale_func,
-    inverse_scale_func,
-    unzip,
-    dateformatter,
-    datetimeformatter,
-    timeformatter
-
 include("types.jl")
 include("utils.jl")
 include("components.jl")
@@ -195,6 +196,7 @@ include("args.jl")
 include("themes.jl")
 include("plot.jl")
 include("pipeline.jl")
+include("series.jl")
 include("layouts.jl")
 include("subplots.jl")
 include("recipes.jl")
@@ -245,7 +247,7 @@ end

 const CURRENT_BACKEND = CurrentBackend(:none)

-include("precompile.jl")
-_precompile_()
+# include("precompile.jl")
+# _precompile_()

 end # module
@@ -71,7 +71,6 @@ function buildanimation(anim::Animation, fn::AbstractString,
                        is_animated_gif::Bool=true;
                        fps::Real = 20, loop::Integer = 0,
                        variable_palette::Bool=false,
-                        verbose=false,
                        show_msg::Bool=true)
    if length(anim.frames) == 0
        throw(ArgumentError("Cannot build empty animations"))
@@ -80,23 +79,20 @@ function buildanimation(anim::Animation, fn::AbstractString,
    fn = abspath(expanduser(fn))
    animdir = anim.dir
    framerate = ffmpeg_framerate(fps)
-    verbose_level = (verbose isa Int ? verbose :
-                        verbose ? 32  # "info"
-                                : 16) # "error"

    if is_animated_gif
        if variable_palette
            # generate a colorpalette for each frame for highest quality, but larger filesize
            palette="palettegen=stats_mode=single[pal],[0:v][pal]paletteuse=new=1"
-            ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
+            ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -lavfi "$palette" -y $fn`)
        else
            # generate a colorpalette first so ffmpeg does not have to guess it
-            ffmpeg_exe(`-v $verbose_level -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
+            ffmpeg_exe(`-v 0 -i $(animdir)/%06d.png -vf "palettegen=stats_mode=diff" -y "$(animdir)/palette.bmp"`)
            # then apply the palette to get better results
-            ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
+            ffmpeg_exe(` -v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
        end
    else
-        ffmpeg_exe(`-v $verbose_level -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
+        ffmpeg_exe(`-v 0 -framerate $framerate -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
    end

    show_msg && @info("Saved animation to ", fn)
@@ -72,11 +72,10 @@ const _arg_desc = KW(
 :display_type             => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
 :extra_kwargs 	          => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",
 :fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",
-:warn_on_unsupported      => "Bool. Warn on unsupported attributes, series types and marker shapes",

 # subplot args
 :title                    => "String. Subplot title.",
-:titlelocation           => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
+:title_location           => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
 :titlefontfamily          => "String or Symbol. Font family of subplot title.",
 :titlefontsize            => "Integer. Font pointsize of subplot title.",
 :titlefonthalign          => "Symbol. Font horizontal alignment of subplot title: :hcenter, :left, :right or :center",
@@ -90,7 +89,7 @@ const _arg_desc = KW(
 :foreground_color_legend  => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
 :foreground_color_title   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of subplot title.",
 :color_palette            => "Vector of colors (cycle through) or color gradient (generate list from gradient) or `:auto` (generate a color list using `Colors.distiguishable_colors` and custom seed colors chosen to contrast with the background).  The color palette is a color list from which series colors are automatically chosen.",
-:legend                   => "Bool (show the legend?) or (x,y) tuple or Symbol (legend position). Bottom left corner of legend is placed at (x,y).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:inside`, `:legend`, `:topright`, `:topleft`, `:bottomleft`, `:bottomright` , `:inline` (note: only some may be supported in each backend)",
+:legend                   => "Bool (show the legend?) or Symbol (legend position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:inside`, `:legend`, `:topright`, `:topleft`, `:bottomleft`, `:bottomright` (note: only some may be supported in each backend)",
 :legendfontfamily         => "String or Symbol. Font family of legend entries.",
 :legendfontsize           => "Integer. Font pointsize of legend entries.",
 :legendfonthalign         => "Symbol. Font horizontal alignment of legend entries: :hcenter, :left, :right or :center",
@@ -86,10 +86,13 @@ const _surface_like = [:contour, :contourf, :contour3d, :heatmap, :surface, :wir

 like_histogram(seriestype::Symbol) = seriestype in _histogram_like
 like_line(seriestype::Symbol)      = seriestype in _line_like
-like_surface(seriestype::Symbol)   = RecipesPipeline.is_surface(seriestype)
+like_surface(seriestype::Symbol)   = seriestype in _surface_like

-RecipesPipeline.is3d(series::Series) = RecipesPipeline.is3d(series.plotattributes)
-RecipesPipeline.is3d(sp::Subplot) = string(sp.attr[:projection]) == "3d"
+is3d(seriestype::Symbol) = seriestype in _3dTypes
+is3d(series::Series) = is3d(series.plotattributes)
+is3d(plotattributes::AKW) = trueOrAllTrue(is3d, Symbol(plotattributes[:seriestype]))
+
+is3d(sp::Subplot) = string(sp.attr[:projection]) == "3d"
 ispolar(sp::Subplot) = string(sp.attr[:projection]) == "polar"
 ispolar(series::Series) = ispolar(series.plotattributes[:subplot])

@@ -264,7 +267,6 @@ const _series_defaults = KW(
    :bar_edges         => false,
    :xerror            => nothing,
    :yerror            => nothing,
-    :zerror            => nothing,
    :ribbon            => nothing,
    :quiver            => nothing,
    :arrow             => nothing,   # allows for adding arrows to line/path... call `arrow(args...)`
@@ -305,13 +307,12 @@ const _plot_defaults = KW(
    :thickness_scaling           => 1,
    :display_type                => :auto,
    :extra_kwargs                => KW(),
-    :warn_on_unsupported         => true,
 )


 const _subplot_defaults = KW(
    :title                    => "",
-    :titlelocation            => :center,           # also :left or :right
+    :title_location           => :center,           # also :left or :right
    :fontfamily_subplot       => :match,
    :titlefontfamily          => :match,
    :titlefontsize            => 14,
@@ -449,39 +450,24 @@ const _initial_fontsizes = Dict(:titlefontsize  => _subplot_defaults[:titlefonts
                                :tickfontsize   => _axis_defaults[:tickfontsize],
                                :guidefontsize  => _axis_defaults[:guidefontsize])

-const _internal_args =
-    [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]
+const _all_args = sort(collect(union(map(keys, _all_defaults)...)))

-const _axis_args = sort(union(collect(keys(_axis_defaults))))
-const _series_args = sort(union(collect(keys(_series_defaults))))
-const _subplot_args = sort(union(collect(keys(_subplot_defaults))))
-const _plot_args = sort(union(collect(keys(_plot_defaults))))
-
-const _magic_axis_args = [:axis, :tickfont, :guidefont, :grid, :minorgrid]
-const _magic_subplot_args = [:titlefont, :legendfont, :legendtitlefont, ]
-const _magic_series_args = [:line, :marker, :fill]
-
-const _all_axis_args = sort(union([_axis_args; _magic_axis_args]))
-const _all_subplot_args = sort(union([_subplot_args; _magic_subplot_args]))
-const _all_series_args = sort(union([_series_args; _magic_series_args]))
-const _all_plot_args = _plot_args
-
-const _all_args =
-    sort([_all_axis_args; _all_subplot_args; _all_series_args; _all_plot_args])
-
-is_subplot_attr(k) = k in _all_subplot_args
-is_series_attr(k) = k in _all_series_args
-is_axis_attr(k) = Symbol(chop(string(k); head=1, tail=0)) in _all_axis_args
-is_axis_attr_noletter(k) = k in _all_axis_args
+is_subplot_attr(k) = haskey(_subplot_defaults, k)
+is_series_attr(k) = haskey(_series_defaults, k)
+#is_axis_attr(k) = haskey(_axis_defaults_byletter, k)
+is_axis_attr(k) = haskey(_axis_defaults, Symbol(chop(string(k); head=1, tail=0)))
+is_axis_attr_noletter(k) = haskey(_axis_defaults, k)

 RecipesBase.is_key_supported(k::Symbol) = is_attr_supported(k)
-is_default_attribute(k) = k in _internal_args || k in _all_args || is_axis_attr_noletter(k)

 # -----------------------------------------------------------------------------

 makeplural(s::Symbol) = Symbol(string(s,"s"))

-autopick_ignore_none_auto(arr::AVec, idx::Integer) = _cycle(setdiff(arr, [:none, :auto]), idx)
+autopick(arr::AVec, idx::Integer) = arr[mod1(idx,length(arr))]
+autopick(notarr, idx::Integer) = notarr
+
+autopick_ignore_none_auto(arr::AVec, idx::Integer) = autopick(setdiff(arr, [:none, :auto]), idx)
 autopick_ignore_none_auto(notarr, idx::Integer) = notarr

 function aliasesAndAutopick(plotattributes::AKW, sym::Symbol, aliases::Dict{Symbol,Symbol}, options::AVec, plotIndex::Int)
@@ -564,18 +550,17 @@ add_aliases(:bins, :bin, :nbin, :nbins, :nb)
 add_aliases(:ribbon, :rib)
 add_aliases(:annotations, :ann, :anns, :annotate, :annotation)
 add_aliases(:xguide, :xlabel, :xlab, :xl)
-add_aliases(:xlims, :xlim, :xlimit, :xlimits, :xrange)
+add_aliases(:xlims, :xlim, :xlimit, :xlimits)
 add_aliases(:xticks, :xtick)
 add_aliases(:xrotation, :xrot, :xr)
 add_aliases(:yguide, :ylabel, :ylab, :yl)
-add_aliases(:ylims, :ylim, :ylimit, :ylimits, :yrange)
+add_aliases(:ylims, :ylim, :ylimit, :ylimits)
 add_aliases(:yticks, :ytick)
 add_aliases(:yrotation, :yrot, :yr)
 add_aliases(:zguide, :zlabel, :zlab, :zl)
 add_aliases(:zlims, :zlim, :zlimit, :zlimits)
 add_aliases(:zticks, :ztick)
 add_aliases(:zrotation, :zrot, :zr)
-add_aliases(:guidefontsize, :labelfontsize)
 add_aliases(:fill_z, :fillz, :fz, :surfacecolor, :surfacecolour, :sc, :surfcolor, :surfcolour)
 add_aliases(:legend, :leg, :key)
 add_aliases(:legendtitle, :legend_title, :labeltitle, :label_title, :leg_title, :key_title)
@@ -590,7 +575,6 @@ add_aliases(:color_palette, :palette)
 add_aliases(:overwrite_figure, :clf, :clearfig, :overwrite, :reuse)
 add_aliases(:xerror, :xerr, :xerrorbar)
 add_aliases(:yerror, :yerr, :yerrorbar, :err, :errorbar)
-add_aliases(:zerror, :zerr, :zerrorbar)
 add_aliases(:quiver, :velocity, :quiver2d, :gradient, :vectorfield)
 add_aliases(:normalize, :norm, :normed, :normalized)
 add_aliases(:show_empty_bins, :showemptybins, :showempty, :show_empty)
@@ -598,7 +582,7 @@ add_aliases(:aspect_ratio, :aspectratio, :axis_ratio, :axisratio, :ratio)
 add_aliases(:match_dimensions, :transpose, :transpose_z)
 add_aliases(:subplot, :sp, :subplt, :splt)
 add_aliases(:projection, :proj)
-add_aliases(:titlelocation, :title_location, :title_loc, :titleloc, :title_position, :title_pos, :titlepos, :titleposition, :title_align, :title_alignment)
+add_aliases(:title_location, :title_loc, :titleloc, :title_position, :title_pos, :titlepos, :titleposition, :title_align, :title_alignment)
 add_aliases(:series_annotations, :series_ann, :seriesann, :series_anns, :seriesanns, :series_annotation, :text, :txt, :texts, :txts)
 add_aliases(:html_output_format, :format, :fmt, :html_format)
 add_aliases(:orientation, :direction, :dir)
@@ -612,7 +596,6 @@ add_aliases(:framestyle, :frame_style, :frame, :axesstyle, :axes_style, :boxstyl
 add_aliases(:tick_direction, :tickdirection, :tick_dir, :tickdir, :tick_orientation, :tickorientation, :tick_or, :tickor)
 add_aliases(:camera, :cam, :viewangle, :view_angle)
 add_aliases(:contour_labels, :contourlabels, :clabels, :clabs)
-add_aliases(:warn_on_unsupported, :warn)

 # add all pluralized forms to the _keyAliases dict
 for arg in keys(_series_defaults)
@@ -655,7 +638,6 @@ function default(k::Symbol)
        letter, key = axis_k
        return _axis_defaults_byletter[letter][key]
    end
-    k == :letter && return k # for type recipe processing
    k in _suppress_warnings || error("Unknown key: ", k)
 end

@@ -679,12 +661,9 @@ function default(k::Symbol, v)
    k in _suppress_warnings || error("Unknown key: ", k)
 end

-function default(; reset = true, kw...)
-    if reset && isempty(kw)
-        reset_defaults()
-    end
+function default(; kw...)
    kw = KW(kw)
-    RecipesPipeline.preprocess_attributes!(kw)
+    preprocessArgs!(kw)
    for (k,v) in kw
        default(k, v)
    end
@@ -937,11 +916,27 @@ function _add_markershape(plotattributes::AKW)
 end

 "Handle all preprocessing of args... break out colors/sizes/etc and replace aliases."
-function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
+function preprocessArgs!(plotattributes::AKW)
    replaceAliases!(plotattributes, _keyAliases)

+    # clear all axis stuff
+    # if haskey(plotattributes, :axis) && plotattributes[:axis] in (:none, nothing, false)
+    #     plotattributes[:ticks] = nothing
+    #     plotattributes[:foreground_color_border] = RGBA(0,0,0,0)
+    #     plotattributes[:foreground_color_axis] = RGBA(0,0,0,0)
+    #     plotattributes[:grid] = false
+    #     delete!(plotattributes, :axis)
+    # end
+    # for letter in (:x, :y, :z)
+    #     asym = Symbol(letter, :axis)
+    #     if haskey(plotattributes, asym) || plotattributes[asym] in (:none, nothing, false)
+    #         plotattributes[Symbol(letter, :ticks)] = nothing
+    #         plotattributes[Symbol(letter, :foreground_color_border)] = RGBA(0,0,0,0)
+    #     end
+    # end
+
    # handle axis args common to all axis
-    args = RecipesPipeline.pop_kw!(plotattributes, :axis, ())
+    args = pop_kw!(plotattributes, :axis, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            process_axis_arg!(plotattributes, arg, letter)
@@ -950,7 +945,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    # handle axis args
    for letter in (:x, :y, :z)
        asym = Symbol(letter, :axis)
-        args = RecipesPipeline.pop_kw!(plotattributes, asym, ())
+        args = pop_kw!(plotattributes, asym, ())
        if !(typeof(args) <: Axis)
            for arg in wraptuple(args)
                process_axis_arg!(plotattributes, arg, letter)
@@ -968,7 +963,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    end

    # handle grid args common to all axes
-    args = RecipesPipeline.pop_kw!(plotattributes, :grid, ())
+    args = pop_kw!(plotattributes, :grid, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            processGridArg!(plotattributes, arg, letter)
@@ -977,13 +972,13 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    # handle individual axes grid args
    for letter in (:x, :y, :z)
        gridsym = Symbol(letter, :grid)
-        args = RecipesPipeline.pop_kw!(plotattributes, gridsym, ())
+        args = pop_kw!(plotattributes, gridsym, ())
        for arg in wraptuple(args)
            processGridArg!(plotattributes, arg, letter)
        end
    end
    # handle minor grid args common to all axes
-    args = RecipesPipeline.pop_kw!(plotattributes, :minorgrid, ())
+    args = pop_kw!(plotattributes, :minorgrid, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            processMinorGridArg!(plotattributes, arg, letter)
@@ -992,14 +987,21 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    # handle individual axes grid args
    for letter in (:x, :y, :z)
        gridsym = Symbol(letter, :minorgrid)
-        args = RecipesPipeline.pop_kw!(plotattributes, gridsym, ())
+        args = pop_kw!(plotattributes, gridsym, ())
        for arg in wraptuple(args)
            processMinorGridArg!(plotattributes, arg, letter)
        end
    end
+    # fonts
+    for fontname in (:titlefont, :legendfont, :legendtitlefont)
+        args = pop_kw!(plotattributes, fontname, ())
+        for arg in wraptuple(args)
+            processFontArg!(plotattributes, fontname, arg)
+        end
+    end
    # handle font args common to all axes
    for fontname in (:tickfont, :guidefont)
-        args = RecipesPipeline.pop_kw!(plotattributes, fontname, ())
+        args = pop_kw!(plotattributes, fontname, ())
        for arg in wraptuple(args)
            for letter in (:x, :y, :z)
                processFontArg!(plotattributes, Symbol(letter, fontname), arg)
@@ -1009,35 +1011,15 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    # handle individual axes font args
    for letter in (:x, :y, :z)
        for fontname in (:tickfont, :guidefont)
-            args = RecipesPipeline.pop_kw!(plotattributes, Symbol(letter, fontname), ())
+            args = pop_kw!(plotattributes, Symbol(letter, fontname), ())
            for arg in wraptuple(args)
                processFontArg!(plotattributes, Symbol(letter, fontname), arg)
            end
        end
    end
-    # handle axes args
-    for k in _axis_args
-        if haskey(plotattributes, k) && k !== :link
-            v = plotattributes[k]
-            for letter in (:x, :y, :z)
-                lk = Symbol(letter, k)
-                if !is_explicit(plotattributes, lk)
-                    plotattributes[lk] = v
-                end
-            end
-        end
-    end
-
-    # fonts
-    for fontname in (:titlefont, :legendfont, :legendtitlefont)
-        args = RecipesPipeline.pop_kw!(plotattributes, fontname, ())
-        for arg in wraptuple(args)
-            processFontArg!(plotattributes, fontname, arg)
-        end
-    end

    # handle line args
-    for arg in wraptuple(RecipesPipeline.pop_kw!(plotattributes, :line, ()))
+    for arg in wraptuple(pop_kw!(plotattributes, :line, ()))
        processLineArg(plotattributes, arg)
    end

@@ -1051,7 +1033,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
        processMarkerArg(plotattributes, arg)
        anymarker = true
    end
-    RecipesPipeline.reset_kw!(plotattributes, :marker)
+    reset_kw!(plotattributes, :marker)
    if haskey(plotattributes, :markershape)
        plotattributes[:markershape] = _replace_markershape(plotattributes[:markershape])
        if plotattributes[:markershape] == :none && plotattributes[:seriestype] in (:scatter, :scatterbins, :scatterhist, :scatter3d) #the default should be :auto, not :none, so that :none can be set explicitly and would be respected
@@ -1065,7 +1047,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    for arg in wraptuple(get(plotattributes, :fill, ()))
        processFillArg(plotattributes, arg)
    end
-    RecipesPipeline.reset_kw!(plotattributes, :fill)
+    reset_kw!(plotattributes, :fill)

    # handle series annotations
    if haskey(plotattributes, :series_annotations)
@@ -1114,16 +1096,75 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    return
 end

+# -----------------------------------------------------------------------------
+
+"A special type that will break up incoming data into groups, and allow for easier creation of grouped plots"
+mutable struct GroupBy
+    groupLabels::Vector           # length == numGroups
+    groupIds::Vector{Vector{Int}} # list of indices for each group
+end
+
+
+# this is when given a vector-type of values to group by
+function extractGroupArgs(v::AVec, args...; legendEntry = string)
+    groupLabels = sort(collect(unique(v)))
+    n = length(groupLabels)
+    if n > 100
+        @warn("You created n=$n groups... Is that intended?")
+    end
+    groupIds = Vector{Int}[filter(i -> v[i] == glab, eachindex(v)) for glab in groupLabels]
+    GroupBy(map(legendEntry, groupLabels), groupIds)
+end
+
+legendEntryFromTuple(ns::Tuple) = join(ns, ' ')
+
+# this is when given a tuple of vectors of values to group by
+function extractGroupArgs(vs::Tuple, args...)
+    isempty(vs) && return GroupBy([""], [axes(args[1],1)])
+    v = map(tuple, vs...)
+    extractGroupArgs(v, args...; legendEntry = legendEntryFromTuple)
+end
+
+# allow passing NamedTuples for a named legend entry
+legendEntryFromTuple(ns::NamedTuple) =
+    join(["$k = $v" for (k, v) in pairs(ns)], ", ")
+
+function extractGroupArgs(vs::NamedTuple, args...)
+    isempty(vs) && return GroupBy([""], [axes(args[1],1)])
+    v = map(NamedTuple{keys(vs)}∘tuple, values(vs)...)
+    extractGroupArgs(v, args...; legendEntry = legendEntryFromTuple)
+end
+
+# expecting a mapping of "group label" to "group indices"
+function extractGroupArgs(idxmap::Dict{T,V}, args...) where {T, V<:AVec{Int}}
+    groupLabels = sortedkeys(idxmap)
+    groupIds = Vector{Int}[collect(idxmap[k]) for k in groupLabels]
+    GroupBy(groupLabels, groupIds)
+end
+
+filter_data(v::AVec, idxfilter::AVec{Int}) = v[idxfilter]
+filter_data(v, idxfilter) = v
+
+function filter_data!(plotattributes::AKW, idxfilter)
+    for s in (:x, :y, :z)
+        plotattributes[s] = filter_data(get(plotattributes, s, nothing), idxfilter)
+    end
+end
+
+function _filter_input_data!(plotattributes::AKW)
+    idxfilter = pop!(plotattributes, :idxfilter, nothing)
+    if idxfilter !== nothing
+        filter_data!(plotattributes, idxfilter)
+    end
+end
+

 # -----------------------------------------------------------------------------

 const _already_warned = Dict{Symbol,Set{Symbol}}()
 const _to_warn = Set{Symbol}()

-function warn_on_unsupported_args(pkg::AbstractBackend, plotattributes)
-    if !get(plotattributes, :warn_on_unsupported, _plot_defaults[:warn_on_unsupported])
-        return
-    end
+function warnOnUnsupported_args(pkg::AbstractBackend, plotattributes)
    empty!(_to_warn)
    bend = backend_name(pkg)
    already_warned = get!(_already_warned, bend, Set{Symbol}())
@@ -1147,10 +1188,7 @@ end
 # _markershape_supported(pkg::AbstractBackend, shape::Shape) = Shape in supported_markers(pkg)
 # _markershape_supported(pkg::AbstractBackend, shapes::AVec) = all([_markershape_supported(pkg, shape) for shape in shapes])

-function warn_on_unsupported(pkg::AbstractBackend, plotattributes)
-    if !get(plotattributes, :warn_on_unsupported, _plot_defaults[:warn_on_unsupported])
-        return
-    end
+function warnOnUnsupported(pkg::AbstractBackend, plotattributes)
    if !is_seriestype_supported(pkg, plotattributes[:seriestype])
        @warn("seriestype $(plotattributes[:seriestype]) is unsupported with $pkg.  Choose from: $(supported_seriestypes(pkg))")
    end
@@ -1162,10 +1200,7 @@ function warn_on_unsupported(pkg::AbstractBackend, plotattributes)
    end
 end

-function warn_on_unsupported_scales(pkg::AbstractBackend, plotattributes::AKW)
-    if !get(plotattributes, :warn_on_unsupported, _plot_defaults[:warn_on_unsupported])
-        return
-    end
+function warnOnUnsupported_scales(pkg::AbstractBackend, plotattributes::AKW)
    for k in (:xscale, :yscale, :zscale, :scale)
        if haskey(plotattributes, k)
            v = plotattributes[k]
@@ -1184,7 +1219,7 @@ function convertLegendValue(val::Symbol)
        :best
    elseif val in (:no, :none)
        :none
-    elseif val in (:right, :left, :top, :bottom, :inside, :best, :legend, :topright, :topleft, :bottomleft, :bottomright, :outertopright, :outertopleft, :outertop, :outerright, :outerleft, :outerbottomright, :outerbottomleft, :outerbottom, :inline)
+    elseif val in (:right, :left, :top, :bottom, :inside, :best, :legend, :topright, :topleft, :bottomleft, :bottomright, :outertopright, :outertopleft, :outertop, :outerright, :outerleft, :outerbottomright, :outerbottomleft, :outerbottom)
        val
    else
        error("Invalid symbol for legend: $val")
@@ -1223,7 +1258,7 @@ function slice_arg!(plotattributes_in, plotattributes_out,
        v
    end
    if remove_pair
-        RecipesPipeline.reset_kw!(plotattributes_in, k)
+        reset_kw!(plotattributes_in, k)
    end
    return
 end
@@ -1407,7 +1442,8 @@ end
 function _update_subplot_colors(sp::Subplot)
    # background colors
    color_or_nothing!(sp.attr, :background_color_subplot)
-    sp.attr[:color_palette] = get_color_palette(sp.attr[:color_palette], 30)
+    bg = plot_color(sp[:background_color_subplot])
+    sp.attr[:color_palette] = get_color_palette(sp.attr[:color_palette], bg, 30)
    color_or_nothing!(sp.attr, :background_color_legend)
    color_or_nothing!(sp.attr, :background_color_inside)

@@ -1435,9 +1471,12 @@ function _update_axis(plt::Plot, sp::Subplot, plotattributes_in::AKW, letter::Sy
 end

 function _update_axis(axis::Axis, plotattributes_in::AKW, letter::Symbol, subplot_index::Int)
+    # grab magic args (for example `xaxis = (:flip, :log)`)
+    args = wraptuple(get(plotattributes_in, Symbol(letter, :axis), ()))
+
    # build the KW of arguments from the letter version (i.e. xticks --> ticks)
    kw = KW()
-    for k in _all_axis_args
+    for k in keys(_axis_defaults)
        # first get the args without the letter: `tickfont = font(10)`
        # note: we don't pop because we want this to apply to all axes! (delete after all have finished)
        if haskey(plotattributes_in, k)
@@ -1452,7 +1491,7 @@ function _update_axis(axis::Axis, plotattributes_in::AKW, letter::Symbol, subplo
    end

    # update the axis
-    attr!(axis; kw...)
+    attr!(axis, args...; kw...)
    return
 end

@@ -1483,7 +1522,7 @@ end

 # update a subplots args and axes
 function _update_subplot_args(plt::Plot, sp::Subplot, plotattributes_in, subplot_index::Int, remove_pair::Bool)
-    anns = RecipesPipeline.pop_kw!(sp.attr, :annotations)
+    anns = pop_kw!(sp.attr, :annotations)

    # # grab those args which apply to this subplot
    for k in keys(_subplot_defaults)
@@ -1510,9 +1549,9 @@ end
 # and assigns a color automatically
 function get_series_color(c, sp::Subplot, n::Int, seriestype)
    if c == :auto
-        c = like_surface(seriestype) ? cgrad() : _cycle(sp[:color_palette], n)
+        c = like_surface(seriestype) ? cgrad() : autopick(sp[:color_palette], n)
    elseif isa(c, Int)
-        c = _cycle(sp[:color_palette], c)
+        c = autopick(sp[:color_palette], c)
    end
    plot_color(c)
 end
@@ -1522,13 +1561,7 @@ function get_series_color(c::AbstractArray, sp::Subplot, n::Int, seriestype)
 end

 function ensure_gradient!(plotattributes::AKW, csym::Symbol, asym::Symbol)
-    if plotattributes[csym] isa ColorPalette
-        α = nothing
-        if !(plotattributes[asym] isa AbstractVector)
-            α = plotattributes[asym]
-        end
-        plotattributes[csym] = cgrad(plotattributes[csym], categorical = true, alpha = α)
-    elseif !(plotattributes[csym] isa ColorGradient)
+    if !isa(plotattributes[csym], ColorGradient)
        plotattributes[csym] = typeof(plotattributes[asym]) <: AbstractVector ? cgrad() : cgrad(alpha = plotattributes[asym])
    end
 end
@@ -17,7 +17,7 @@ function Axis(sp::Subplot, letter::Symbol, args...; kw...)
        :show => true,  # show or hide the axis? (useful for linked subplots)
    )

-    attr = DefaultsDict(explicit, _axis_defaults_byletter[letter])
+    attr = Attr(explicit, _axis_defaults_byletter[letter])

    # update the defaults
    attr!(Axis([sp], attr), args...; kw...)
@@ -84,9 +84,6 @@ function attr!(axis::Axis, args...; kw...)
        process_axis_arg!(plotattributes, arg)
    end

-    # then preprocess keyword arguments
-    RecipesPipeline.preprocess_attributes!(KW(kw))
-
    # then override for any keywords... only those keywords that already exists in plotattributes
    for (k,v) in kw
        if haskey(plotattributes, k)
@@ -117,11 +114,33 @@ Base.setindex!(axis::Axis, v, ks::Symbol...) = setindex!(axis.plotattributes, v,
 Base.haskey(axis::Axis, k::Symbol) = haskey(axis.plotattributes, k)
 ignorenan_extrema(axis::Axis) = (ex = axis[:extrema]; (ex.emin, ex.emax))

+
+const _scale_funcs = Dict{Symbol,Function}(
+    :log10 => log10,
+    :log2 => log2,
+    :ln => log,
+)
+const _inv_scale_funcs = Dict{Symbol,Function}(
+    :log10 => exp10,
+    :log2 => exp2,
+    :ln => exp,
+)
+
+# const _label_func = Dict{Symbol,Function}(
+#     :log10 => x -> "10^$x",
+#     :log2 => x -> "2^$x",
+#     :ln => x -> "e^$x",
+# )
+
 const _label_func = Dict{Symbol,Function}(
    :log10 => x -> "10^$x",
    :log2 => x -> "2^$x",
    :ln => x -> "e^$x",
 )
+
+
+scalefunc(scale::Symbol) = x -> get(_scale_funcs, scale, identity)(Float64(x))
+invscalefunc(scale::Symbol) = x -> get(_inv_scale_funcs, scale, identity)(Float64(x))
 labelfunc(scale::Symbol, backend::AbstractBackend) = get(_label_func, scale, string)

 function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
@@ -129,7 +148,7 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)

    # scale the limits
    scale = axis[:scale]
-    sf = RecipesPipeline.scale_func(scale)
+    sf = scalefunc(scale)

    # If the axis input was a Date or DateTime use a special logic to find
    # "round" Date(Time)s as ticks
@@ -139,7 +158,7 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
    # rather than on the input format
    # TODO: maybe: non-trivial scale (:ln, :log2, :log10) for date/datetime
    if ticks === nothing && scale == :identity
-        if axis[:formatter] == RecipesPipeline.dateformatter
+        if axis[:formatter] == dateformatter
            # optimize_datetime_ticks returns ticks and labels(!) based on
            # integers/floats corresponding to the DateTime type. Thus, the axes
            # limits, which resulted from converting the Date type to integers,
@@ -150,7 +169,7 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
                k_min = 2, k_max = 4)
            # Now the ticks are converted back to floats corresponding to Dates.
            return ticks / 864e5, labels
-        elseif axis[:formatter] == RecipesPipeline.datetimeformatter
+        elseif axis[:formatter] == datetimeformatter
            return optimize_datetime_ticks(amin, amax; k_min = 2, k_max = 4)
        end
    end
@@ -174,11 +193,11 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
            # chosen  ticks is not too much bigger than amin - amax:
            strict_span = false,
        )
-        axis[:lims] = map(RecipesPipeline.inverse_scale_func(scale), (viewmin, viewmax))
+        axis[:lims] = map(invscalefunc(scale), (viewmin, viewmax))
    else
        scaled_ticks = map(sf, (filter(t -> amin <= t <= amax, ticks)))
    end
-    unscaled_ticks = map(RecipesPipeline.inverse_scale_func(scale), scaled_ticks)
+    unscaled_ticks = map(invscalefunc(scale), scaled_ticks)

    labels = if any(isfinite, unscaled_ticks)
        formatter = axis[:formatter]
@@ -283,7 +302,7 @@ function get_minor_ticks(sp, axis, ticks)
    minorticks = typeof(ticks[1])[]
    for (i,hi) in enumerate(ticks[2:end])
        lo = ticks[i]
-        if isfinite(lo) && isfinite(hi) && hi > lo
+        if isfinite(lo) && hi > lo
            append!(minorticks,collect(lo + (hi-lo)/n :(hi-lo)/n: hi - (hi-lo)/2n))
        end
    end
@@ -378,7 +397,7 @@ function expand_extrema!(sp::Subplot, plotattributes::AKW)
    if fr === nothing && plotattributes[:seriestype] == :bar
        fr = 0.0
    end
-    if fr !== nothing && !RecipesPipeline.is3d(plotattributes)
+    if fr !== nothing && !all3D(plotattributes)
        axis = sp.attr[vert ? :yaxis : :xaxis]
        if typeof(fr) <: Tuple
            for fri in fr
@@ -423,7 +442,7 @@ end

 # push the limits out slightly
 function widen(lmin, lmax, scale = :identity)
-    f, invf = RecipesPipeline.scale_func(scale), RecipesPipeline.inverse_scale_func(scale)
+    f, invf = scalefunc(scale), invscalefunc(scale)
    span = f(lmax) - f(lmin)
    # eps = NaNMath.max(1e-16, min(1e-2span, 1e-10))
    eps = NaNMath.max(1e-16, 0.03span)
@@ -462,12 +481,11 @@ function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(l
    lims = axis[:lims]
    has_user_lims = (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
    if has_user_lims
-        lmin, lmax = lims
-        if lmin != :auto && isfinite(lmin)
-            amin = lmin
+        if isfinite(lims[1])
+            amin = lims[1]
        end
-        if lmax != :auto && isfinite(lmax)
-            amax = lmax
+        if isfinite(lims[2])
+            amax = lims[2]
        end
    end
    if amax <= amin && isfinite(amin)
@@ -493,7 +511,7 @@ function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(l
        amin, amax
    end

-    if !has_user_lims && consider_aspect && letter in (:x, :y) && !(sp[:aspect_ratio] in (:none, :auto) || RecipesPipeline.is3d(:sp))
+    if !has_user_lims && consider_aspect && letter in (:x, :y) && !(sp[:aspect_ratio] in (:none, :auto) || is3d(:sp))
        aspect_ratio = isa(sp[:aspect_ratio], Number) ? sp[:aspect_ratio] : 1
        plot_ratio = height(plotarea(sp)) / width(plotarea(sp))
        dist = amax - amin
@@ -627,8 +645,8 @@ function axis_drawing_info(sp::Subplot)
            sp[:framestyle] in (:semi, :box) && push!(xborder_segs, (xmin, y2), (xmax, y2)) # top spine
        end
        if !(xaxis[:ticks] in (:none, nothing, false))
-            f = RecipesPipeline.scale_func(yaxis[:scale])
-            invf = RecipesPipeline.inverse_scale_func(yaxis[:scale])
+            f = scalefunc(yaxis[:scale])
+            invf = invscalefunc(yaxis[:scale])
            tick_start, tick_stop = if sp[:framestyle] == :origin
                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
                (-t, t)
@@ -681,8 +699,8 @@ function axis_drawing_info(sp::Subplot)
            sp[:framestyle] in (:semi, :box) && push!(yborder_segs, (x2, ymin), (x2, ymax)) # right spine
        end
        if !(yaxis[:ticks] in (:none, nothing, false))
-            f = RecipesPipeline.scale_func(xaxis[:scale])
-            invf = RecipesPipeline.inverse_scale_func(xaxis[:scale])
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
            tick_start, tick_stop = if sp[:framestyle] == :origin
                t = invf(f(0) + 0.012 * (f(xmax) - f(xmin)))
                (-t, t)
@@ -773,8 +791,8 @@ function axis_drawing_info_3d(sp::Subplot)
            sp[:framestyle] in (:semi, :box) && push!(xborder_segs, (xmin, y2, z2), (xmax, y2, z2)) # top spine
        end
        if !(xaxis[:ticks] in (:none, nothing, false))
-            f = RecipesPipeline.scale_func(yaxis[:scale])
-            invf = RecipesPipeline.inverse_scale_func(yaxis[:scale])
+            f = scalefunc(yaxis[:scale])
+            invf = invscalefunc(yaxis[:scale])
            tick_start, tick_stop = if sp[:framestyle] == :origin
                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
                (-t, t)
@@ -848,8 +866,8 @@ function axis_drawing_info_3d(sp::Subplot)
            sp[:framestyle] in (:semi, :box) && push!(yborder_segs, (x2, ymin, z2), (x2, ymax, z2)) # right spine
        end
        if !(yaxis[:ticks] in (:none, nothing, false))
-            f = RecipesPipeline.scale_func(xaxis[:scale])
-            invf = RecipesPipeline.inverse_scale_func(xaxis[:scale])
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
            tick_start, tick_stop = if sp[:framestyle] == :origin
                t = invf(f(0) + 0.012 * (f(xmax) - f(xmin)))
                (-t, t)
@@ -923,8 +941,8 @@ function axis_drawing_info_3d(sp::Subplot)
            sp[:framestyle] in (:semi, :box) && push!(zborder_segs, (x2, y2, zmin), (x2, y2, zmax))
        end
        if !(zaxis[:ticks] in (:none, nothing, false))
-            f = RecipesPipeline.scale_func(xaxis[:scale])
-            invf = RecipesPipeline.inverse_scale_func(xaxis[:scale])
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
            tick_start, tick_stop = if sp[:framestyle] == :origin
                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
                (-t, t)
@@ -30,7 +30,7 @@ macro init_backend(s)
    esc(quote
        struct $T <: AbstractBackend end
        export $sym
-        $sym(; kw...) = (default(; reset = false, kw...); backend($T()))
+        $sym(; kw...) = (default(; kw...); backend($T()))
        backend_name(::$T) = Symbol($str)
        backend_package_name(pkg::$T) = backend_package_name(Symbol($str))
        push!(_backends, Symbol($str))
@@ -104,7 +104,7 @@ end
 # Set the (left, top, right, bottom) minimum padding around the plot area
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot)
-    # TODO: something different when `RecipesPipeline.is3d(sp) == true`
+    # TODO: something different when `is3d(sp) == true`
    leftpad   = tick_padding(sp, sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
    toppad    = sp[:top_margin]    + title_padding(sp)
    rightpad  = sp[:right_margin]
@@ -211,7 +211,7 @@ const _base_supported_args = [
    :seriestype,
    :seriescolor, :seriesalpha,
    :smooth,
-    :xerror, :yerror, :zerror,
+    :xerror, :yerror,
    :subplot,
    :x, :y, :z,
    :show, :size,
@@ -378,7 +378,7 @@ const _plotly_attr = merge_with_base_supported([
    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokestyle,
    :fillrange, :fillcolor, :fillalpha,
    :bins,
-    :title, :titlelocation,
+    :title, :title_location,
    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
    :titlefontcolor,
    :legendfontfamily, :legendfontsize, :legendfontcolor,
@@ -505,7 +505,7 @@ const _pyplot_attr = merge_with_base_supported([
    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
    :fillrange, :fillcolor, :fillalpha,
    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :titlelocation, :titlefont,
+    :title, :title_location, :titlefont,
    :window_title,
    :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
    :titlefontfamily, :titlefontsize, :titlefontcolor,
@@ -568,9 +568,6 @@ const _unicodeplots_style = [:auto, :solid]
 const _unicodeplots_marker = [:none, :auto, :circle]
 const _unicodeplots_scale = [:identity]

-# Additional constants
-const _canvas_type = Ref(:auto)
-
 # ------------------------------------------------------------------------------
 # hdf5

@@ -585,7 +582,7 @@ const _hdf5_attr = merge_with_base_supported([
    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
    :fillrange, :fillcolor, :fillalpha,
    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :titlelocation, :titlefont,
+    :title, :title_location, :titlefont,
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
@@ -615,23 +612,6 @@ const _hdf5_style = [:auto, :solid, :dash, :dot, :dashdot]
 const _hdf5_marker = vcat(_allMarkers, :pixel)
 const _hdf5_scale = [:identity, :ln, :log2, :log10]

-# Additional constants
-#Dict has problems using "Types" as keys.  Initialize in "_initialize_backend":
-const HDF5PLOT_MAP_STR2TELEM = Dict{String, Type}()
-const HDF5PLOT_MAP_TELEM2STR = Dict{Type, String}()
-
-#Don't really like this global variable... Very hacky
-mutable struct HDF5Plot_PlotRef
-	ref::Union{Plot, Nothing}
-end
-const HDF5PLOT_PLOTREF = HDF5Plot_PlotRef(nothing)
-
-#Simple sub-structures that can just be written out using _hdf5plot_gwritefields:
-const HDF5PLOT_SIMPLESUBSTRUCT = Union{Font, BoundingBox,
-	GridLayout, RootLayout, ColorGradient, SeriesAnnotations, PlotText,
-	Shape,
-}
-
 # ------------------------------------------------------------------------------
 # inspectdr

@@ -649,7 +629,7 @@ const _inspectdr_attr = merge_with_base_supported([
    :markerstrokestyle, #Causes warning not to have it... what is this?
    :fillcolor, :fillalpha, #:fillrange,
 #    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :titlelocation,
+    :title, :title_location,
    :window_title,
    :guide, :lims, :scale, #:ticks, :flip, :rotation,
    :titlefontfamily, :titlefontsize, :titlefontcolor,
@@ -820,6 +800,3 @@ const _pgfplotsx_marker = [
 ]
 const _pgfplotsx_scale = [:identity, :ln, :log2, :log10]
 is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true
-
-# additional constants
-const _pgfplotsx_series_ids = KW()
@@ -9,37 +9,53 @@ export GR

 # --------------------------------------------------------------------------------------

-gr_linetype(k) = (auto = 1, solid = 1, dash = 2, dot = 3, dashdot = 4, dashdotdot = -1)[k]
+const gr_linetype = KW(
+    :auto => 1,
+    :solid => 1,
+    :dash => 2,
+    :dot => 3,
+    :dashdot => 4,
+    :dashdotdot => -1
+)

-gr_markertype(k) = (
-    auto = 1,
-    none = -1,
-    circle = -1,
-    rect = -7,
-    diamond = -13,
-    utriangle = -3,
-    dtriangle = -5,
-    ltriangle = -18,
-    rtriangle = -17,
-    pentagon = -21,
-    hexagon = -22,
-    heptagon = -23,
-    octagon = -24,
-    cross = 2,
-    xcross = 5,
-    + = 2,
-    x = 5,
-    star4 = -25,
-    star5 = -26,
-    star6 = -27,
-    star7 = -28,
-    star8 = -29,
-    vline = -30,
-    hline = -31,
-)[k]
+const gr_markertype = KW(
+    :auto => 1,
+    :none => -1,
+    :circle => -1,
+    :rect => -7,
+    :diamond => -13,
+    :utriangle => -3,
+    :dtriangle => -5,
+    :ltriangle => -18,
+    :rtriangle => -17,
+    :pentagon => -21,
+    :hexagon => -22,
+    :heptagon => -23,
+    :octagon => -24,
+    :cross => 2,
+    :xcross => 5,
+    :+ => 2,
+    :x => 5,
+    :star4 => -25,
+    :star5 => -26,
+    :star6 => -27,
+    :star7 => -28,
+    :star8 => -29,
+    :vline => -30,
+    :hline => -31
+)

-gr_halign(k) = (left = 1, hcenter = 2, right = 3)[k]
-gr_valign(k) = (top = 1, vcenter = 3, bottom = 5)[k]
+const gr_halign = KW(
+    :left => 1,
+    :hcenter => 2,
+    :right => 3
+)
+
+const gr_valign = KW(
+    :top => 1,
+    :vcenter => 3,
+    :bottom => 5
+)

 const gr_font_family = Dict(
    "times" => 1,
@@ -51,11 +67,6 @@ const gr_font_family = Dict(
    "palatino" => 26
 )

-const gr_vector_font = Dict(
-    "serif-roman" => 232,
-    "sans-serif" => 233
-)
-
 # --------------------------------------------------------------------------------------

 gr_color(c) = gr_color(c, color_type(c))
@@ -87,19 +98,16 @@ gr_set_transparency(c, α) = gr_set_transparency(α)
 gr_set_transparency(c::Colorant, ::Nothing) = gr_set_transparency(c)
 gr_set_transparency(c::Colorant) = GR.settransparency(alpha(c))

-gr_set_arrowstyle(s::Symbol) = GR.setarrowstyle(get(
-    (
-        simple = 1,
-        hollow = 3,
-        filled = 4,
-        triangle = 5,
-        filledtriangle = 6,
-        closed = 6,
-        open = 5,
-    ),
-    s,
-    1,
-))
+const _gr_arrow_map = Dict(
+    :simple => 1,
+    :hollow => 3,
+    :filled => 4,
+    :triangle => 5,
+    :filledtriangle => 6,
+    :closed => 6,
+    :open => 5,
+)
+gr_set_arrowstyle(s::Symbol) = GR.setarrowstyle(get(_gr_arrow_map, s, 1))

 # --------------------------------------------------------------------------------------

@@ -332,7 +340,7 @@ function gr_draw_marker(series, xi, yi, clims, i, msize::Number, shape::Symbol)
    gr_set_bordercolor(get_markerstrokecolor(series, i));
    gr_set_markercolor(get_markercolor(series, clims, i));
    gr_set_transparency(get_markeralpha(series, i))
-    GR.setmarkertype(gr_markertype(shape))
+    GR.setmarkertype(gr_markertype[shape])
    GR.setmarkersize(0.3msize / nominal_size())
    GR.polymarker([xi], [yi])
 end
@@ -357,7 +365,7 @@ end
 # ---------------------------------------------------------

 function gr_set_line(lw, style, c) #, a)
-    GR.setlinetype(gr_linetype(style))
+    GR.setlinetype(gr_linetype[style])
    w, h = gr_plot_size
    GR.setlinewidth(_gr_thickness_scaling[1] * max(0, lw / nominal_size()))
    gr_set_linecolor(c) #, a)
@@ -382,11 +390,9 @@ function gr_set_font(f::Font; halign = f.halign, valign = f.valign,
    GR.setcharup(sind(-rotation), cosd(-rotation))
    if haskey(gr_font_family, family)
        GR.settextfontprec(100 + gr_font_family[family], GR.TEXT_PRECISION_STRING)
-    elseif haskey(gr_vector_font, family)
-        GR.settextfontprec(gr_vector_font[family], 3)
    end
    gr_set_textcolor(color)
-    GR.settextalign(gr_halign(halign), gr_valign(valign))
+    GR.settextalign(gr_halign[halign], gr_valign[valign])
 end

 function gr_nans_to_infs!(z)
@@ -413,6 +419,8 @@ const viewport_plotarea = zeros(4)
 # the size of the current plot in pixels
 const gr_plot_size = [600.0, 400.0]

+const gr_colorbar_ratio = 0.1
+
 function gr_viewport_from_bbox(sp::Subplot{GRBackend}, bb::BoundingBox, w, h, viewport_canvas)
    viewport = zeros(4)
    viewport[1] = viewport_canvas[2] * (left(bb) / w)
@@ -420,7 +428,7 @@ function gr_viewport_from_bbox(sp::Subplot{GRBackend}, bb::BoundingBox, w, h, vi
    viewport[3] = viewport_canvas[4] * (1.0 - bottom(bb) / h)
    viewport[4] = viewport_canvas[4] * (1.0 - top(bb) / h)
    if hascolorbar(sp)
-        viewport[2] -= 0.1 * (1 + RecipesPipeline.is3d(sp) / 2)
+        viewport[2] -= gr_colorbar_ratio * (1 + is3d(sp) / 2)
    end
    viewport
 end
@@ -428,8 +436,8 @@ end
 # change so we're focused on the viewport area
 function gr_set_viewport_cmap(sp::Subplot)
    GR.setviewport(
-        viewport_plotarea[2] + (RecipesPipeline.is3d(sp) ? 0.07 : 0.02),
-        viewport_plotarea[2] + (RecipesPipeline.is3d(sp) ? 0.10 : 0.05),
+        viewport_plotarea[2] + (is3d(sp) ? 0.07 : 0.02),
+        viewport_plotarea[2] + (is3d(sp) ? 0.10 : 0.05),
        viewport_plotarea[3],
        viewport_plotarea[4]
    )
@@ -519,7 +527,7 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
    GR.setwindow(xmin, xmax, zmin, zmax)
    if !isempty(cbar.gradients)
        series = cbar.gradients
-        gr_set_gradient(_cbar_unique(get_colorgradient.(series),"color"))
+        gr_set_gradient(_cbar_unique(gr_get_color.(series),"color"))
        gr_set_transparency(_cbar_unique(get_fillalpha.(series), "fill alpha"))
        GR.cellarray(xmin, xmax, zmax, zmin, 1, 256, 1000:1255)
    end
@@ -527,7 +535,7 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
    if !isempty(cbar.fills)
        series = cbar.fills
        GR.setfillintstyle(GR.INTSTYLE_SOLID)
-        gr_set_gradient(_cbar_unique(get_colorgradient.(series), "color"))
+        gr_set_gradient(_cbar_unique(gr_get_color.(series), "color"))
        gr_set_transparency(_cbar_unique(get_fillalpha.(series), "fill alpha"))
        levels = _cbar_unique(contour_levels.(series, Ref(clims)), "levels")
        # GR implicitly uses the maximal z value as the highest level
@@ -546,7 +554,7 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)

    if !isempty(cbar.lines)
        series = cbar.lines
-        gr_set_gradient(_cbar_unique(get_colorgradient.(series),"color"))
+        gr_set_gradient(_cbar_unique(gr_get_color.(series),"color"))
        gr_set_line(_cbar_unique(get_linewidth.(series), "line width"),
                    _cbar_unique(get_linestyle.(series), "line style"),
                    _cbar_unique(get_linecolor.(series, Ref(clims)), "line color"))
@@ -566,7 +574,7 @@ function gr_draw_colorbar(cbar::GRColorbar, sp::Subplot, clims)
    gr_set_font(guidefont(sp[:yaxis]))
    GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_TOP)
    GR.setcharup(-1, 0)
-    gr_text(viewport_plotarea[2] + 0.1,
+    gr_text(viewport_plotarea[2] + gr_colorbar_ratio,
            gr_view_ycenter(), sp[:colorbar_title])

    GR.restorestate()
@@ -629,20 +637,38 @@ end

 # --------------------------------------------------------------------------------------

+const _gr_gradient_alpha = ones(256)
+
 function gr_set_gradient(c)
    grad = _as_gradient(c)
    for (i,z) in enumerate(range(0, stop=1, length=256))
        c = grad[z]
        GR.setcolorrep(999+i, red(c), green(c), blue(c))
+        _gr_gradient_alpha[i] = alpha(c)
    end
    grad
 end

 function gr_set_gradient(series::Series)
-    color = get_colorgradient(series)
+    color = gr_get_color(series)
    color !== nothing && gr_set_gradient(color)
 end

+function gr_get_color(series::Series)
+    st = series[:seriestype]
+    if st in (:surface, :heatmap) || isfilledcontour(series)
+        series[:fillcolor]
+    elseif st in (:contour, :wireframe)
+        series[:linecolor]
+    elseif series[:marker_z] !== nothing
+        series[:markercolor]
+    elseif series[:line_z] !==  nothing
+        series[:linecolor]
+    elseif series[:fill_z] !== nothing
+        series[:fillcolor]
+    end
+end
+
 # this is our new display func... set up the viewport_canvas, compute bounding boxes, and display each subplot
 function gr_display(plt::Plot, fmt="")
    GR.clearws()
@@ -789,7 +815,6 @@ end

 function _update_min_padding!(sp::Subplot{GRBackend})
    dpi = sp.plt[:thickness_scaling]
-    ENV["GKS_ENCODING"] = "utf8"
    if !haskey(ENV, "GKSwstype")
        if isijulia()
            ENV["GKSwstype"] = "svg"
@@ -808,7 +833,7 @@ function _update_min_padding!(sp::Subplot{GRBackend})
        toppad += h
    end

-    if RecipesPipeline.is3d(sp)
+    if is3d(sp)
        xaxis, yaxis, zaxis = sp[:xaxis], sp[:yaxis], sp[:zaxis]
        xticks, yticks, zticks = get_ticks(sp, xaxis), get_ticks(sp, yaxis), get_ticks(sp, zaxis)
        # Add margin for x and y ticks
@@ -847,8 +872,7 @@ function _update_min_padding!(sp::Subplot{GRBackend})
                tickfont(zaxis),
                halign = (zaxis[:mirror] ? :left : :right),
                valign = (:top, :vcenter, :bottom)[sign(zaxis[:rotation]) + 2],
-                rotation = zaxis[:rotation],
-                color = zaxis[:tickfontcolor],
+                rotation = zaxis[:rotation]
            )
            l = 0.01 + first(gr_get_ticks_size(zticks, zaxis[:rotation]))
            w = 1mm + gr_plot_size[1] * l * px
@@ -1019,17 +1043,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            viewport_plotarea[3] += legendh + 0.04
        end
    end
-    if sp[:legend] == :inline
-        if sp[:yaxis][:mirror]
-            viewport_plotarea[1] += legendw
-        else
-            viewport_plotarea[2] -= legendw
-        end
-    end

    # fill in the plot area background
    bg = plot_color(sp[:background_color_inside])
-    RecipesPipeline.is3d(sp) || gr_fill_viewport(viewport_plotarea, bg)
+    is3d(sp) || gr_fill_viewport(viewport_plotarea, bg)

    # reduced from before... set some flags based on the series in this subplot
    # TODO: can these be generic flags?
@@ -1100,7 +1117,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    gr_set_font(tickfont(xaxis))
    GR.setlinewidth(sp.plt[:thickness_scaling])

-    if RecipesPipeline.is3d(sp)
+    if is3d(sp)
        zmin, zmax = axis_limits(sp, :z)
        GR.setspace(zmin, zmax, round.(Int, sp[:camera])...)

@@ -1111,7 +1128,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        plot_area_x = [xmin, xmin, xmin, xmax, xmax, xmax, xmin]
        plot_area_y = [ymin, ymin, ymax, ymax, ymax, ymin, ymin]
        plot_area_z = [zmin, zmax, zmax, zmax, zmin, zmin, zmin]
-        x_bg, y_bg = RecipesPipeline.unzip(GR.wc3towc.(plot_area_x, plot_area_y, plot_area_z))
+        x_bg, y_bg = unzip(GR.wc3towc.(plot_area_x, plot_area_y, plot_area_z))
        GR.fillarea(x_bg, y_bg)

        # draw the grid lines
@@ -1206,8 +1223,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                tickfont(xaxis),
                halign = (:left, :hcenter, :right)[sign(xaxis[:rotation]) + 2],
                valign = (xaxis[:mirror] ? :bottom : :top),
-                rotation = xaxis[:rotation],
-                color = xaxis[:tickfontcolor],
+                rotation = xaxis[:rotation]
            )
            yt = if sp[:framestyle] == :origin
                0
@@ -1237,8 +1253,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                tickfont(yaxis),
                halign = (:left, :hcenter, :right)[sign(yaxis[:rotation]) + 2],
                valign = (yaxis[:mirror] ? :bottom : :top),
-                rotation = yaxis[:rotation],
-                color = yaxis[:tickfontcolor],
+                rotation = yaxis[:rotation]
            )
            xt = if sp[:framestyle] == :origin
                0
@@ -1268,8 +1283,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                tickfont(zaxis),
                halign = (zaxis[:mirror] ? :left : :right),
                valign = (:top, :vcenter, :bottom)[sign(zaxis[:rotation]) + 2],
-                rotation = zaxis[:rotation],
-                color = zaxis[:tickfontcolor],
+                rotation = zaxis[:rotation]
            )
            xt = if sp[:framestyle] == :origin
                0
@@ -1315,6 +1329,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        end

        xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xminorgrid_segs, yminorgrid_segs, xborder_segs, yborder_segs = axis_drawing_info(sp)
+        # @show xticks yticks #spine_segs grid_segs

        # draw the grid lines
        if xaxis[:grid]
@@ -1402,16 +1417,14 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        end

        # border
-        intensity = sp[:framestyle] == :semi ? 0.5 : 1
+        intensity = sp[:framestyle] == :semi ? 0.5 : 1.0
        if sp[:framestyle] in (:box, :semi)
-            GR.setclip(0)
            gr_set_line(intensity, :solid, xaxis[:foreground_color_border])
            gr_set_transparency(xaxis[:foreground_color_border], intensity)
            gr_polyline(coords(xborder_segs)...)
            gr_set_line(intensity, :solid, yaxis[:foreground_color_border])
            gr_set_transparency(yaxis[:foreground_color_border], intensity)
            gr_polyline(coords(yborder_segs)...)
-            GR.setclip(1)
        end
    end
    # end
@@ -1420,7 +1433,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    GR.savestate()
    if sp[:title] != ""
        gr_set_font(titlefont(sp))
-        loc = sp[:titlelocation]
+        loc = sp[:title_location]
        if loc == :left
            xpos = viewport_plotarea[1]
            halign = GR.TEXT_HALIGN_LEFT
@@ -1434,7 +1447,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        GR.settextalign(halign, GR.TEXT_VALIGN_TOP)
        gr_text(xpos, viewport_subplot[4], sp[:title])
    end
-    if RecipesPipeline.is3d(sp)
+    if is3d(sp)
        if xaxis[:guide] != ""
            gr_set_font(
                guidefont(xaxis),
@@ -1592,7 +1605,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

        elseif st == :contour
            GR.setspace(clims[1], clims[2], 0, 90)
-            GR.setlinetype(gr_linetype(get_linestyle(series)))
+            GR.setlinetype(gr_linetype[get_linestyle(series)])
            GR.setlinewidth(max(0, get_linewidth(series)) / nominal_size())
            is_lc_black = let black=plot_color(:black)
                plot_color(series[:linecolor]) in (black,[black])
@@ -1631,32 +1644,34 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

        elseif st == :heatmap
            zmin, zmax = clims
-            fillgrad = _as_gradient(series[:fillcolor])
            if !ispolar(sp)
-                GR.setspace(clims..., 0, 90)
+                GR.setspace(zmin, zmax, 0, 90)
                x, y = heatmap_edges(series[:x], sp[:xaxis][:scale], series[:y], sp[:yaxis][:scale], size(series[:z]))
                w, h = length(x) - 1, length(y) - 1
+                z_normalized = map(x -> GR.jlgr.normalize_color(x, zmin, zmax), z)
                if is_uniformly_spaced(x) && is_uniformly_spaced(y)
                    # For uniformly spaced data use GR.drawimage, which can be
                    # much faster than GR.nonuniformcellarray, especially for
                    # pdf output, and also supports alpha values.
                    # Note that drawimage draws uniformly spaced data correctly
                    # even on log scales, where it is visually non-uniform.
-                    colors = plot_color.(get(fillgrad, z, clims), series[:fillalpha])
+                    fillgrad = _as_gradient(series[:fillcolor])
+                    colors = plot_color.(fillgrad[z_normalized], series[:fillalpha])
+                    colors[isnan.(z_normalized)] .= RGBA(0,0,0,0)
                    rgba = gr_color.(colors)
                    GR.drawimage(first(x), last(x), last(y), first(y), w, h, rgba)
                else
-                    if something(series[:fillalpha],1) < 1
-                        @warn "GR: transparency not supported in non-uniform heatmaps. Alpha values ignored."
-                    end
-                    colors = get(fillgrad, z, clims)
-                    z_normalized = map(c -> c == invisible() ? 256/255 : PlotUtils.getinverse(fillgrad, c), colors)
-                    rgba = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
-                    GR.nonuniformcellarray(x, y, w, h, rgba)
+                    (something(series[:fillalpha],1) < 1 || any(_gr_gradient_alpha .< 1)) && @warn(
+                            "GR: transparency not supported in non-uniform heatmaps. Alpha values ignored.")
+                    z_normalized = map(x -> isnan(x) ? 256/255 : x, z_normalized) # results in color index = 1256 -> transparent
+                    colors = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
+                    GR.nonuniformcellarray(x, y, w, h, colors)
                end
            else
                phimin, phimax = 0.0, 360.0 # nonuniform polar array is not yet supported in GR.jl
                nx, ny = length(series[:x]), length(series[:y])
+                z_normalized = map(x -> GR.jlgr.normalize_color(x, zmin, zmax), z)
+                colors = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
                xmin, xmax, ymin, ymax = xy_lims
                rmax = data_lims[4]
                GR.setwindow(-rmax, rmax, -rmax, rmax)
@@ -1666,11 +1681,8 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                if series[:y][end] != ny
                    @warn "Right now only the maximum value of y (r) is taken into account."
                end
-                colors = get(fillgrad, z, clims)
-                z_normalized = map(c -> c == invisible() ? 256/255 : PlotUtils.getinverse(fillgrad.colors, c), colors)
-                rgba = Int32[round(Int32, 1000 + _i * 255) for _i in z_normalized]
                # GR.polarcellarray(0, 0, phimin, phimax, ymin, ymax, nx, ny, colors)
-                GR.polarcellarray(0, 0, phimin, phimax, 0, ymax, nx, ny, rgba)
+                GR.polarcellarray(0, 0, phimin, phimax, 0, ymax, nx, ny, colors)
                # Right now only the maximum value of y (r) is taken into account.
                # This is certainly not perfect but nonuniform polar array is not yet supported in GR.jl
            end
@@ -1692,7 +1704,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

            # draw markers
            if st == :scatter3d || series[:markershape] != :none
-                x2, y2 = RecipesPipeline.unzip(map(GR.wc3towc, x, y, z))
+                x2, y2 = unzip(map(GR.wc3towc, x, y, z))
                gr_draw_markers(series, x2, y2, clims)
            end

@@ -1786,21 +1798,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            gr_text(GR.wctondc(xi, yi)..., str)
        end

-        if sp[:legend] == :inline && should_add_to_legend(series)
-            gr_set_font(legendfont(sp))
-            gr_set_textcolor(plot_color(sp[:legendfontcolor]))
-            if sp[:yaxis][:mirror]
-                (_,i) = sp[:xaxis][:flip] ? findmax(x) : findmin(x)
-                GR.settextalign(GR.TEXT_HALIGN_RIGHT, GR.TEXT_VALIGN_HALF)
-                offset = -0.01
-            else
-                (_,i) = sp[:xaxis][:flip] ? findmin(x) : findmax(x)
-                GR.settextalign(GR.TEXT_HALIGN_LEFT, GR.TEXT_VALIGN_HALF)
-                offset = 0.01
-            end
-            (x_l,y_l) = GR.wctondc(x[i],y[i])
-            gr_text(x_l+offset,y_l,series[:label])
-        end
        GR.restorestate()
    end

@@ -1808,7 +1805,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    hascolorbar(sp) && gr_draw_colorbar(cbar, sp, get_clims(sp))

    # add the legend
-    if !(sp[:legend] in(:none, :inline))
+    if sp[:legend] != :none
        GR.savestate()
        GR.selntran(0)
        GR.setscale(0)
@@ -1891,7 +1888,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    end
    for ann in sp[:annotations]
        x, y, val = locate_annotation(sp, ann...)
-        x, y = if RecipesPipeline.is3d(sp)
+        x, y = if is3d(sp)
            gr_w3tondc(x, y, z)
        else
            GR.wctondc(x, y)
@@ -1905,14 +1902,18 @@ end

 # ----------------------------------------------------------------

-for (mime, fmt) in (
-    "application/pdf" => "pdf",
-    "image/png" => "png",
-    "application/postscript" => "ps",
-    "image/svg+xml" => "svg",
+const _gr_mimeformats = Dict(
+    "application/pdf"         => "pdf",
+    "image/png"               => "png",
+    "application/postscript"  => "ps",
+    "image/svg+xml"           => "svg",
 )
+
+const _gr_wstype = Ref(get(ENV, "GKSwstype", ""))
+gr_set_output(wstype::String) = (_gr_wstype[] = wstype)
+
+for (mime, fmt) in _gr_mimeformats
    @eval function _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{GRBackend})
-        ENV["GKS_ENCODING"] = "utf8"
        GR.emergencyclosegks()
        filepath = tempname() * "." * $fmt
        env = get(ENV, "GKSwstype", "0")
@@ -1925,13 +1926,12 @@ for (mime, fmt) in (
        if env != "0"
            ENV["GKSwstype"] = env
        else
-            pop!(ENV, "GKSwstype")
+            pop!(ENV,"GKSwstype")
        end
    end
 end

 function _display(plt::Plot{GRBackend})
-    ENV["GKS_ENCODING"] = "utf8"
    if plt[:display_type] == :inline
        GR.emergencyclosegks()
        filepath = tempname() * ".pdf"
@@ -1944,6 +1944,9 @@ function _display(plt::Plot{GRBackend})
        rm(filepath)
    else
        ENV["GKS_DOUBLE_BUF"] = true
+        if _gr_wstype[] != ""
+            ENV["GKSwstype"] = _gr_wstype[]
+        end
        gr_display(plt)
    end
 end
@@ -37,6 +37,33 @@ import FixedPointNumbers: N0f8 #In core Julia
 struct HDF5PlotNative; end #Indentifies a data element that can natively be handled by HDF5
 struct HDF5CTuple; end #Identifies a "complex" tuple structure

+mutable struct HDF5Plot_PlotRef
+	ref::Union{Plot, Nothing}
+end
+
+
+#==Useful constants
+===============================================================================#
+const _hdf5_nullable{T} = Union{T, Nothing}
+const _hdf5_plotroot = "plot"
+const _hdf5_dataroot = "data" #TODO: Eventually move data to different root (easier to locate)?
+const _hdf5plot_datatypeid = "TYPE" #Attribute identifying type
+const _hdf5plot_countid = "COUNT" #Attribute for storing count
+
+#Dict has problems using "Types" as keys.  Initialize in "_initialize_backend":
+const HDF5PLOT_MAP_STR2TELEM = Dict{String, Type}()
+const HDF5PLOT_MAP_TELEM2STR = Dict{Type, String}()
+
+#Don't really like this global variable... Very hacky
+const HDF5PLOT_PLOTREF = HDF5Plot_PlotRef(nothing)
+
+#Simple sub-structures that can just be written out using _hdf5plot_gwritefields:
+const HDF5PLOT_SIMPLESUBSTRUCT = Union{Font, BoundingBox,
+	GridLayout, RootLayout, ColorGradient, SeriesAnnotations, PlotText,
+	Shape,
+}
+
+
 #==
 ===============================================================================#
 is_marker_supported(::HDF5Backend, shape::Shape) = true
@@ -56,7 +83,6 @@ if length(HDF5PLOT_MAP_TELEM2STR) < 1
        "ARRAY" => Array, #Dict won't allow Array to be key in HDF5PLOT_MAP_TELEM2STR

        #Sub-structure types:
-        "DEFAULTSDICT" => DefaultsDict,
        "FONT" => Font,
        "BOUNDINGBOX" => BoundingBox,
        "GRIDLAYOUT" => GridLayout,
@@ -68,7 +94,7 @@ if length(HDF5PLOT_MAP_TELEM2STR) < 1
        "AXIS" => Axis,
        "SURFACE" => Surface,
        "SUBPLOT" => Subplot,
-        "NULLABLE" => Union{Nothing, T} where T,
+        "NULLABLE" => _hdf5_nullable,
    )
    merge!(HDF5PLOT_MAP_STR2TELEM, telem2str)
    merge!(HDF5PLOT_MAP_TELEM2STR, Dict{Type, String}(v=>k for (k,v) in HDF5PLOT_MAP_STR2TELEM))
@@ -78,12 +104,12 @@ end
 #==Helper functions
 ===============================================================================#

-_hdf5_plotelempath(subpath::String) = "plot/$subpath"
-_hdf5_datapath(subpath::String) = "data/$subpath"
+_hdf5_plotelempath(subpath::String) = "$_hdf5_plotroot/$subpath"
+_hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath"
 _hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k]
 _hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]]

-function _hdf5_merge!(dest::AKW, src::AKW)
+function _hdf5_merge!(dest, src)
    for (k, v) in src
        if isa(v, Axis)
            _hdf5_merge!(dest[k].plotattributes, v.plotattributes)
@@ -174,38 +200,38 @@ end

 function _hdf5plot_writetype(grp, k::String, tstr::Array{String})
    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, "TYPE", tstr)
+    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_writetype(grp, k::String, T::Type)
    tstr = HDF5PLOT_MAP_TELEM2STR[T]
    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, "TYPE", tstr)
+    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_overwritetype(grp, k::String, T::Type)
    tstr = HDF5PLOT_MAP_TELEM2STR[T]
    d = HDF5.d_open(grp, k)
-    HDF5.a_delete(d, "TYPE")
-    HDF5.a_write(d, "TYPE", tstr)
+    HDF5.a_delete(d, _hdf5plot_datatypeid)
+    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_writetype(grp, T::Type) #Write directly to group
    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_write(grp, "TYPE", tstr)
+    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_overwritetype(grp, T::Type) #Write directly to group
    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_delete(grp, "TYPE")
-    HDF5.a_write(grp, "TYPE", tstr)
+    HDF5.a_delete(grp, _hdf5plot_datatypeid)
+    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_writetype(grp, ::Type{Array{T}}) where T<:Any
    tstr = HDF5PLOT_MAP_TELEM2STR[Array] #ANY
-    HDF5.a_write(grp, "TYPE", tstr)
+    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_writetype(grp, ::Type{T}) where T<:BoundingBox
    tstr = HDF5PLOT_MAP_TELEM2STR[BoundingBox]
-    HDF5.a_write(grp, "TYPE", tstr)
+    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
 end
 function _hdf5plot_writecount(grp, n::Int) #Write directly to group
-    HDF5.a_write(grp, "COUNT", n)
+    HDF5.a_write(grp, _hdf5plot_countid, n)
 end
 function _hdf5plot_gwritefields(grp, k::String, v)
    grp = HDF5.g_create(grp, k)
@@ -237,15 +263,6 @@ function _hdf5plot_gwrite(grp, k::String, v::Array{T}) where T<:Number #Default
    grp[k] = v
    _hdf5plot_writetype(grp, k, HDF5PlotNative)
 end
-function _hdf5plot_gwrite(grp, k::String, v::Dict)
-#=
-	tstr = string(Dict)
-	path = HDF5.name(grp) * "/" * k
-	@info("Type not supported: $tstr\npath: $path")
-=#
-	#No support for structures with Dicts different than KW (plotattributes)
-end
-
 #=
 function _hdf5plot_gwrite(grp, k::String, v::Array{Any})
 #    @show grp, k
@@ -278,8 +295,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Tuple)
    end
    #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple".
 end
-function _hdf5plot_gwrite(grp, k::String, plotattributes::KW)
-	#NOTE: Can only write directly to group, not a subi-item
+function _hdf5plot_gwrite(grp, k::String, plotattributes::AKW)
 #    @warn("Cannot write dict: $k=$plotattributes")
 end
 function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
@@ -345,7 +361,7 @@ function _hdf5plot_gwrite(grp, k::String, v::Surface)
 	_hdf5plot_writetype(grp, Surface)
 end
 # #TODO: "Properly" support Nullable using _hdf5plot_writetype?
-# function _hdf5plot_gwrite(grp, k::String, v::Union{Nothing, T} where T)
+# function _hdf5plot_gwrite(grp, k::String, v::_hdf5_nullable)
 #     if isnull(v)
 #         _hdf5plot_gwrite(grp, k, nothing)
 #     else
@@ -360,22 +376,13 @@ function _hdf5plot_gwrite(grp, k::String, v::Subplot)
    _hdf5plot_writetype(grp, Subplot)
    return
 end
-
-function _hdf5plot_write(grp, plotattributes::KW)
+function _hdf5plot_write(grp, plotattributes::AKW)
    for (k, v) in plotattributes
        kstr = string(k)
        _hdf5plot_gwrite(grp, kstr, v)
    end
    return
 end
-function _hdf5plot_write(grp, plotattributes::DefaultsDict)
-    for (k, v) in plotattributes
-        kstr = string(k)
-        _hdf5plot_gwrite(grp, kstr, v)
-    end
-	_hdf5plot_writetype(grp, DefaultsDict)
-end
-

 # Write main plot structures:
 # ----------------------------------------------------------------
@@ -421,7 +428,7 @@ hdf5plot_write(path::AbstractString) = hdf5plot_write(current(), path)
 ===============================================================================#

 function _hdf5plot_readcount(grp) #Read directly from group
-    return HDF5.a_read(grp, "COUNT")
+    return HDF5.a_read(grp, _hdf5plot_countid)
 end

 _hdf5plot_convert(T::Type{HDF5PlotNative}, v) = v
@@ -438,14 +445,20 @@ _hdf5plot_convert(T::Type{Extrema}, v) = Extrema(v[1], v[2])
 # Read data structures:
 # ----------------------------------------------------------------

-function _hdf5plot_read(grp, k::String, T::Type)
+function _hdf5plot_read(grp, k::String, T::Type, dtid)
    v = HDF5.d_read(grp, k)
    return _hdf5plot_convert(T, v)
 end
+function _hdf5plot_read(grp, k::String, T::Type{Length}, dtid::Vector)
+    v = HDF5.d_read(grp, k)
+    TU = Symbol(dtid[2])
+    T = typeof(v)
+    return Length{TU,T}(v)
+end

 # Read more complex data structures:
 # ----------------------------------------------------------------
-function _hdf5plot_read(grp, k::String, T::Type{Font})
+function _hdf5plot_read(grp, k::String, T::Type{Font}, dtid)
    grp = HDF5.g_open(grp, k)

    family = _hdf5plot_read(grp, "family")
@@ -456,7 +469,7 @@ function _hdf5plot_read(grp, k::String, T::Type{Font})
    color = _hdf5plot_read(grp, "color")
    return Font(family, pointsize, halign, valign, rotation, color)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Array}) #ANY
+function _hdf5plot_read(grp, k::String, T::Type{Array}, dtid) #ANY
    grp = HDF5.g_open(grp, k)
    sz = _hdf5plot_read(grp, "dim")
    if [0] == sz; return []; end
@@ -475,18 +488,18 @@ function _hdf5plot_read(grp, k::String, T::Type{Array}) #ANY
    result = [result[iter] for iter in eachindex(result)] #Potentially make more specific
    return reshape(result, sz)
 end
-function _hdf5plot_read(grp, k::String, T::Type{HDF5CTuple})
-    v = _hdf5plot_read(grp, k, Array)
+function _hdf5plot_read(grp, k::String, T::Type{HDF5CTuple}, dtid)
+    v = _hdf5plot_read(grp, k, Array, dtid)
    return tuple(v...)
 end
-function _hdf5plot_read(grp, k::String, T::Type{PlotText})
+function _hdf5plot_read(grp, k::String, T::Type{PlotText}, dtid)
    grp = HDF5.g_open(grp, k)

    str = _hdf5plot_read(grp, "str")
    font = _hdf5plot_read(grp, "font")
    return PlotText(str, font)
 end
-function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations})
+function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations}, dtid)
    grp = HDF5.g_open(grp, k)

    strs = _hdf5plot_read(grp, "strs")
@@ -495,29 +508,29 @@ function _hdf5plot_read(grp, k::String, T::Type{SeriesAnnotations})
    scalefactor = _hdf5plot_read(grp, "scalefactor")
    return SeriesAnnotations(strs, font, baseshape, scalefactor)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Shape})
+function _hdf5plot_read(grp, k::String, T::Type{Shape}, dtid)
    grp = HDF5.g_open(grp, k)

    x = _hdf5plot_read(grp, "x")
    y = _hdf5plot_read(grp, "y")
    return Shape(x, y)
 end
-function _hdf5plot_read(grp, k::String, T::Type{ColorGradient})
+function _hdf5plot_read(grp, k::String, T::Type{ColorGradient}, dtid)
    grp = HDF5.g_open(grp, k)

    colors = _hdf5plot_read(grp, "colors")
    values = _hdf5plot_read(grp, "values")
    return ColorGradient(colors, values)
 end
-function _hdf5plot_read(grp, k::String, T::Type{BoundingBox})
+function _hdf5plot_read(grp, k::String, T::Type{BoundingBox}, dtid)
    grp = HDF5.g_open(grp, k)

    x0 = _hdf5plot_read(grp, "x0")
    a = _hdf5plot_read(grp, "a")
    return BoundingBox(x0, a)
 end
-_hdf5plot_read(grp, k::String, T::Type{RootLayout}) = RootLayout()
-function _hdf5plot_read(grp, k::String, T::Type{GridLayout})
+_hdf5plot_read(grp, k::String, T::Type{RootLayout}, dtid) = RootLayout()
+function _hdf5plot_read(grp, k::String, T::Type{GridLayout}, dtid)
    grp = HDF5.g_open(grp, k)

 #    parent = _hdf5plot_read(grp, "parent")
@@ -531,44 +544,30 @@ parent = RootLayout()

    return GridLayout(parent, minpad, bbox, grid, widths, heights, attr)
 end
-function _hdf5plot_read(grp, T::Type{DefaultsDict})
-    attr = DefaultsDict(KW(), _plot_defaults)
-    v = _hdf5plot_read(grp, attr)
-    return attr
-end
-function _hdf5plot_read(grp, k::String, T::Type{Axis})
+function _hdf5plot_read(grp, k::String, T::Type{Axis}, dtid)
    grp = HDF5.g_open(grp, k)
-    plotattributes = DefaultsDict(KW(), _plot_defaults)
-    _hdf5plot_read(grp, plotattributes)
-    return Axis([], plotattributes)
+    kwlist = KW()
+    _hdf5plot_read(grp, kwlist)
+    return Axis([], kwlist)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Surface})
+function _hdf5plot_read(grp, k::String, T::Type{Surface}, dtid)
    grp = HDF5.g_open(grp, k)
    data2d = _hdf5plot_read(grp, "data2d")
    return Surface(data2d)
 end
-function _hdf5plot_read(grp, k::String, T::Type{Subplot})
+function _hdf5plot_read(grp, k::String, T::Type{Subplot}, dtid)
    grp = HDF5.g_open(grp, k)
    idx = _hdf5plot_read(grp, "index")
    return HDF5PLOT_PLOTREF.ref.subplots[idx]
 end
-
-#Most types don't need dtid for read!!:
-_hdf5plot_read(grp, k::String, T::Type, dtid) = _hdf5plot_read(grp, k, T)
-function _hdf5plot_read(grp, k::String, T::Type{Length}, dtid::Vector)
-    v = HDF5.d_read(grp, k)
-    TU = Symbol(dtid[2])
-    T = typeof(v)
-    return Length{TU,T}(v)
-end
 function _hdf5plot_read(grp, k::String)
-    dtid = HDF5.a_read(grp[k], "TYPE")
+    dtid = HDF5.a_read(grp[k], _hdf5plot_datatypeid)
    T = _hdf5_map_str2telem(dtid) #expect exception
    return _hdf5plot_read(grp, k, T, dtid)
 end

 #Read in values in group to populate plotattributes:
-function _hdf5plot_readattr(grp, plotattributes::AbstractDict)
+function _hdf5plot_read(grp, plotattributes::AKW)
    gnames = names(grp)
    for k in gnames
        try
@@ -582,8 +581,6 @@ function _hdf5plot_readattr(grp, plotattributes::AbstractDict)
    end
    return
 end
-_hdf5plot_read(grp, plotattributes::KW) = _hdf5plot_readattr(grp, plotattributes)
-_hdf5plot_read(grp, plotattributes::DefaultsDict) = _hdf5plot_readattr(grp, plotattributes)

 # Read main plot structures:
 # ----------------------------------------------------------------
@@ -596,17 +593,17 @@ function _hdf5plot_read(sp::Subplot, subpath::String, f)

    for i in 1:nseries
        grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/series_list/series$i"))
-        seriesinfo = DefaultsDict(KW(), _plot_defaults)
-        _hdf5plot_read(grp, seriesinfo)
-        plot!(sp, seriesinfo[:x], seriesinfo[:y]) #Add data & create data structures
-        _hdf5_merge!(sp.series_list[end].plotattributes, seriesinfo)
+        kwlist = KW()
+        _hdf5plot_read(grp, kwlist)
+        plot!(sp, kwlist[:x], kwlist[:y]) #Add data & create data structures
+        _hdf5_merge!(sp.series_list[end].plotattributes, kwlist)
    end

    #Perform after adding series... otherwise values get overwritten:
    grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/attr"))
-    attr = DefaultsDict(KW(), _plot_defaults)
-    _hdf5plot_read(grp, attr)
-    _hdf5_merge!(sp.attr, attr)
+    kwlist = KW()
+    _hdf5plot_read(grp, kwlist)
+    _hdf5_merge!(sp.attr, kwlist)

    return
 end
@@ -429,23 +429,29 @@ end

 # ----------------------------------------------------------------

+const _inspectdr_mimeformats_dpi = Dict(
+    "image/png"               => "png"
+)
+const _inspectdr_mimeformats_nodpi = Dict(
+    "image/svg+xml"           => "svg",
+    "application/eps"         => "eps",
+    "image/eps"               => "eps",
+#    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
+    "application/pdf"         => "pdf"
+)
 _inspectdr_show(io::IO, mime::MIME, ::Nothing, w, h) =
    throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
 function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
    InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
 end

-function _show(io::IO, mime::MIME{Symbol("image/png")}, plt::Plot{InspectDRBackend})
-    dpi = plt[:dpi] # TODO: support
-    _inspectdr_show(io, "image/png", _inspectdr_getmplot(plt.o), plt[:size]...)
+for (mime, fmt) in _inspectdr_mimeformats_dpi
+    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
+        dpi = plt[:dpi]#TODO: support
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+    end
 end
-for (mime, fmt) in (
-    "image/svg+xml" => "svg",
-    "application/eps" => "eps",
-    "image/eps" => "eps",
-    # "application/postscript" => "ps", # TODO: support once Cairo supports PSSurface
-    "application/pdf" => "pdf",
-)
+for (mime, fmt) in _inspectdr_mimeformats_nodpi
    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
    end
@@ -12,12 +12,13 @@ function plotlybase_syncplot(plt::Plot)
    return plt.o
 end

-for (mime, fmt) in (
+const _orca_mimeformats = Dict(
    "application/pdf" => "pdf",
-    "image/png" => "png",
-    "image/svg+xml" => "svg",
-    "image/eps" => "eps",
+    "image/png"       => "png",
+    "image/svg+xml"   => "svg",
+    "image/eps"       => "eps",
 )
-    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend}) =
-        ORCA.PlotlyBase.savefig(io, plotlybase_syncplot(plt), format = $fmt)
+
+for (mime, fmt) in _orca_mimeformats
+    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyBackend}) = ORCA.PlotlyBase.savefig(io, plotlybase_syncplot(plt), format = $fmt)
 end
@@ -166,7 +166,7 @@ function pgf_series(sp::Subplot, series::Series)
    # function args
    args = if st == :contour
        plotattributes[:z].surf, plotattributes[:x], plotattributes[:y]
-    elseif RecipesPipeline.is3d(st)
+    elseif is3d(st)
        plotattributes[:x], plotattributes[:y], plotattributes[:z]
    elseif st == :straightline
        straightline_data(series)
@@ -271,7 +271,7 @@ function pgf_fillrange_series(series, i, fillrange, args...)
        push!(style, _pgf_series_extrastyle[st])
    end
    kw[:style] = join(style, ',')
-    func = RecipesPipeline.is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
+    func = is3d(series) ? PGFPlots.Linear3 : PGFPlots.Linear
    return func(pgf_fillrange_args(fillrange, args...)...; kw...)
 end

@@ -444,7 +444,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})

        # add to style/kw for each axis
        for letter in (:x, :y, :z)
-            if letter != :z || RecipesPipeline.is3d(sp)
+            if letter != :z || is3d(sp)
                axisstyle, axiskw = pgf_axis(sp, letter)
                append!(style, axisstyle)
                merge!(kw, axiskw)
@@ -494,7 +494,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
        if any(s[:seriestype] == :contour for s in series_list(sp))
            kw[:view] = "{0}{90}"
            kw[:colorbar] = !(sp[:colorbar] in (:none, :off, :hide, false))
-        elseif RecipesPipeline.is3d(sp)
+        elseif is3d(sp)
            azim, elev = sp[:camera]
            kw[:view] = "{$(azim)}{$(elev)}"
        end
@@ -29,20 +29,11 @@ Base.@kwdef mutable struct PGFPlotsXPlot
        PGFPlotsX.push_preamble!(
            pgfx_plot.the_plot,
            raw"""
-            \pgfplotsset{%
-            layers/standard/.define layer set={%
-                background,axis background,axis grid,axis ticks,axis lines,axis tick labels,pre main,main,axis descriptions,axis foreground%
-            }{grid style= {/pgfplots/on layer=axis grid},%
-                tick style= {/pgfplots/on layer=axis ticks},%
-                axis line style= {/pgfplots/on layer=axis lines},%
-                label style= {/pgfplots/on layer=axis descriptions},%
-                legend style= {/pgfplots/on layer=axis descriptions},%
-                title style= {/pgfplots/on layer=axis descriptions},%
-                colorbar style= {/pgfplots/on layer=axis descriptions},%
-                ticklabel style= {/pgfplots/on layer=axis tick labels},%
-                axis background@ style={/pgfplots/on layer=axis background},%
-                3d box foreground style={/pgfplots/on layer=axis foreground},%
-                },
+            \pgfplotsset{
+            /pgfplots/layers/axis on top/.define layer set={
+            background, axis background,pre main,main,axis grid,axis ticks,axis lines,axis tick labels,
+            axis descriptions,axis foreground
+            }{/pgfplots/layers/standard},
            }
            """,
        )
@@ -85,7 +76,6 @@ end

 function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
    if !pgfx_plot.is_created || pgfx_plot.was_shown
-        pgfx_sanitize_plot!(plt)
        the_plot = PGFPlotsX.TikzPicture(PGFPlotsX.Options())
        bgc = plt.attr[:background_color_outside] == :match ?
            plt.attr[:background_color] : plt.attr[:background_color_outside]
@@ -104,43 +94,27 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
        end

        for sp in plt.subplots
-            bb1 = sp.plotarea
-            bb2 = bbox(sp)
-            sp_width = width(bb2)
-            sp_height = height(bb2)
-            dx, dy = bb2.x0
-            lpad = leftpad(sp) + sp[:left_margin]
-            rpad = rightpad(sp) + sp[:right_margin]
-            tpad = toppad(sp) + sp[:top_margin]
-            bpad = bottompad(sp) + sp[:bottom_margin]
-            dx += lpad
-            dy += tpad
-            axis_height = sp_height - (tpad + bpad)
-            axis_width = sp_width - (rpad + lpad)
-
+            bb = bbox(sp)
+            sp_width = width(bb)
+            sp_height = height(bb)
+            dx, dy = bb.x0
+            # TODO: does this hold at every scale?
+            if sp[:legend] in (:outertopright, nothing)
+                dx *= 1.2
+            end
            cstr = plot_color(sp[:background_color_legend])
            a = alpha(cstr)
            fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
            title_cstr = plot_color(sp[:titlefontcolor])
            title_a = alpha(title_cstr)
-            title_loc = sp[:titlelocation]
            bgc_inside = plot_color(sp[:background_color_inside])
            bgc_inside_a = alpha(bgc_inside)
            axis_opt = PGFPlotsX.Options(
                "title" => sp[:title],
                "title style" => PGFPlotsX.Options(
-                        "at" => if title_loc == :left
-                            "{(0,1)}"
-                        elseif title_loc == :right
-                            "{(1,1)}"
-                        elseif title_loc isa Tuple
-                            "{$(string(title_loc))}"
-                        else
-                            "{(0.5,1)}"
-                        end,
-                        "font" => pgfx_font(
-                            sp[:titlefontsize],
-                            pgfx_thickness_scaling(sp),
+                    "font" => pgfx_font(
+                        sp[:titlefontsize],
+                        pgfx_thickness_scaling(sp),
                    ),
                    "color" => title_cstr,
                    "draw opacity" => title_a,
@@ -165,24 +139,30 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                    "fill" => bgc_inside,
                    "opacity" => bgc_inside_a,
                ),
+                "axis on top" => nothing,
+                # "framed" => nothing,
                # These are for layouting
                "anchor" => "north west",
                "xshift" => string(dx),
                "yshift" => string(-dy),
            )
-            sp_width > 0 * mm ? push!(axis_opt, "width" => string(axis_width)) :
+            sp_width > 0 * mm ? push!(axis_opt, "width" => string(sp_width)) :
            nothing
-            sp_height > 0 * mm ? push!(axis_opt, "height" => string(axis_height)) :
+            sp_height > 0 * mm ? push!(axis_opt, "height" => string(sp_height)) :
            nothing
            # legend position
            if sp[:legend] isa Tuple
                x, y = sp[:legend]
                push!(axis_opt["legend style"], "at={($x, $y)}")
            else
-                push!(axis_opt["legend style"], pgfx_get_legend_pos(sp[:legend])...)
+                push!(
+                    axis_opt,
+                    "legend pos" =>
+                        get(_pgfplotsx_legend_pos, sp[:legend], "outer north east"),
+                )
            end
            for letter in (:x, :y, :z)
-                if letter != :z || RecipesPipeline.is3d(sp)
+                if letter != :z || is3d(sp)
                    pgfx_axis!(axis_opt, sp, letter)
                end
            end
@@ -197,13 +177,12 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
            # As it is likely that all series within the same axis use the same
            # colormap this should not cause any problem.
            for series in series_list(sp)
-                    if hascolorbar(series)
-                        cg = get_colorgradient(series)
-                        cm = pgfx_colormap(get_colorgradient(series))
+                for col in (:markercolor, :fillcolor, :linecolor)
+                    if typeof(series.plotattributes[col]) == ColorGradient
                        PGFPlotsX.push_preamble!(
                            pgfx_plot.the_plot,
                            """\\pgfplotsset{
-                            colormap={plots$(sp.attr[:subplot_index])}{$cm},
+                            colormap={plots$(sp.attr[:subplot_index])}{$(pgfx_colormap(series.plotattributes[col]))},
                            }""",
                        )
                        push!(
@@ -211,16 +190,10 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                            "colorbar" => nothing,
                            "colormap name" => "plots$(sp.attr[:subplot_index])",
                        )
-                        if cg isa PlotUtils.CategoricalColorGradient
-                            push!(
-                                axis_opt,
-                                "colormap access" => "piecewise const",
-                                "colorbar sampled" => nothing,
-                            )
-                        end
                        # goto is needed to break out of col and series for
                        @goto colorbar_end
                    end
+                end
            end
            @label colorbar_end

@@ -228,11 +201,11 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                axis_opt,
                "colorbar style" => PGFPlotsX.Options(
                    "title" => sp[:colorbar_title],
+                    "point meta max" => get_clims(sp)[2],
+                    "point meta min" => get_clims(sp)[1],
                ),
-                "point meta max" => get_clims(sp)[2],
-                "point meta min" => get_clims(sp)[1],
            )
-            if RecipesPipeline.is3d(sp)
+            if is3d(sp)
                azim, elev = sp[:camera]
                push!(axis_opt, "view" => (azim, elev))
            end
@@ -244,16 +217,6 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                PGFPlotsX.Axis
            end
            axis = axisf(axis_opt)
-            if sp[:legendtitle] !== nothing
-                push!(axis, PGFPlotsX.Options("\\addlegendimage{empty legend}" => nothing))
-                push!(
-                    axis,
-                    PGFPlotsX.LegendEntry(
-                        string("\\hspace{-.6cm}{\\textbf{", sp[:legendtitle], "}}"),
-                        false,
-                    ),
-                )
-            end
            for (series_index, series) in enumerate(series_list(sp))
                # give each series a uuid for fillbetween
                series_id = uuid4()
@@ -265,7 +228,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                    "color" => single_color(opt[:linecolor]),
                    "name path" => string(series_id),
                )
-                if RecipesPipeline.is3d(series) || st == :heatmap
+                if is3d(series) || st == :heatmap
                    series_func = PGFPlotsX.Plot3
                else
                    series_func = PGFPlotsX.Plot
@@ -296,7 +259,7 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                        if marker isa Shape
                            x = marker.x
                            y = marker.y
-                            scale_factor = 0.00125
+                            scale_factor = 0.025
                            mark_size = opt[:markersize] * scale_factor
                            path = join(
                                [
@@ -371,51 +334,51 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
                            series_index,
                        )
                    end
+                    # add series annotations
+                    anns = series[:series_annotations]
+                    for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y])
+                        pgfx_add_annotation!(
+                            axis,
+                            xi,
+                            yi,
+                            PlotText(str, fnt),
+                            pgfx_thickness_scaling(series),
+                        )
+                    end
                    # add to legend?
-                    if sp[:legend] != :none
+                    if sp[:legend] != :none && pgfx_should_add_to_legend(series)
                        leg_entry = if opt[:label] isa AVec
                            get(opt[:label], i, "")
                        elseif opt[:label] isa AbstractString
                            if i == 1
-                                get(opt, :label, "")
+                                opt[:label]
                            else
                                ""
                            end
                        else
                            throw(ArgumentError("Malformed label. label = $(opt[:label])"))
                        end
-                        if leg_entry == "" || !pgfx_should_add_to_legend(series)
-                            push!(axis.contents[end].options, "forget plot" => nothing)
-                        else
-                            leg_opt = PGFPlotsX.Options()
-                            if ribbon !== nothing
-                                pgfx_filllegend!(axis.contents[end - 3].options, opt)
-                            end
-                            legend = PGFPlotsX.LegendEntry(leg_opt, leg_entry, false)
-                            push!(axis, legend)
+                        if leg_entry == ""
+                            push!(segment_plot.options, "forget plot" => nothing)
+                            continue
                        end
+                        leg_opt = PGFPlotsX.Options()
+                        if ribbon !== nothing
+                            pgfx_filllegend!(axis.contents[end - 3].options, opt)
+                        end
+                        legend = PGFPlotsX.LegendEntry(leg_opt, leg_entry, false)
+                        push!(axis, legend)
                    end
                end # for segments
-                # add series annotations
-                anns = series[:series_annotations]
-                for (xi, yi, str, fnt) in EachAnn(anns, series[:x], series[:y])
+                # add subplot annotations
+                for ann in sp[:annotations]
                    pgfx_add_annotation!(
                        axis,
-                        xi,
-                        yi,
-                        PlotText(str, fnt),
-                        pgfx_thickness_scaling(series),
+                        locate_annotation(sp, ann...)...,
+                        pgfx_thickness_scaling(sp),
                    )
                end
            end # for series
-            # add subplot annotations
-            for ann in sp[:annotations]
-                pgfx_add_annotation!(
-                    axis,
-                    locate_annotation(sp, ann...)...,
-                    pgfx_thickness_scaling(sp),
-                )
-            end
            push!(the_plot, axis)
            if length(plt.o.the_plot.elements) > 0
                plt.o.the_plot.elements[1] = the_plot
@@ -424,7 +387,6 @@ function (pgfx_plot::PGFPlotsXPlot)(plt::Plot{PGFPlotsXBackend})
            end
        end # for subplots
        pgfx_plot.is_created = true
-        pgfx_plot.was_shown = false
    end # if
    return pgfx_plot
 end
@@ -436,7 +398,7 @@ end
        opt[:x], opt[:y], Array(opt[:z])'
    elseif st in (:heatmap, :surface, :wireframe)
        surface_to_vecs(opt[:x], opt[:y], opt[:z])
-    elseif RecipesPipeline.is3d(st)
+    elseif is3d(st)
        opt[:x], opt[:y], opt[:z]
    elseif st == :straightline
        straightline_data(series)
@@ -593,65 +555,51 @@ function pgfx_series_coordinates!(
    """
 end
 ##
-pgfx_get_linestyle(k) = get(
-    (
-        solid = "solid",
-        dash = "dashed",
-        dot = "dotted",
-        dashdot = "dashdotted",
-        dashdotdot = "dashdotdotted",
-    ),
-    Symbol(k),
-    "solid",
+const _pgfplotsx_linestyles = KW(
+    :solid => "solid",
+    :dash => "dashed",
+    :dot => "dotted",
+    :dashdot => "dashdotted",
+    :dashdotdot => "dashdotdotted",
 )

-pgfx_get_marker(k) = get(
-    (
-        none = "none",
-        cross = "+",
-        xcross = "x",
-        + = "+",
-        x = "x",
-        utriangle = "triangle*",
-        dtriangle = "triangle*",
-        rtriangle = "triangle*",
-        ltriangle = "triangle*",
-        circle = "*",
-        rect = "square*",
-        star5 = "star",
-        star6 = "asterisk",
-        diamond = "diamond*",
-        pentagon = "pentagon*",
-        hline = "-",
-        vline = "|",
-    ),
-    Symbol(k),
-    "*",
+const _pgfplotsx_series_ids = KW()
+
+const _pgfplotsx_markers = KW(
+    :none => "none",
+    :cross => "+",
+    :xcross => "x",
+    :+ => "+",
+    :x => "x",
+    :utriangle => "triangle*",
+    :dtriangle => "triangle*",
+    :rtriangle => "triangle*",
+    :ltriangle => "triangle*",
+    :circle => "*",
+    :rect => "square*",
+    :star5 => "star",
+    :star6 => "asterisk",
+    :diamond => "diamond*",
+    :pentagon => "pentagon*",
+    :hline => "-",
+    :vline => "|",
 )

-pgfx_get_legend_pos(k) = get(
-    (
-        top = ("at" => string((0.5, 0.98)), "anchor" => "north"),
-        bottom = ("at" => string((0.5, 0.02)), "anchor" => "south"),
-        left = ("at" => string((0.02, 0.5)), "anchor" => "west"),
-        right = ("at" => string((0.98, 0.5)), "anchor" => "east"),
-        bottomleft = ("at" => string((0.02, 0.02)), "anchor" => "south west"),
-        bottomright = ("at" => string((0.98, 0.02)), "anchor" => "south east"),
-        topright = ("at" => string((0.98, 0.98)), "anchor" => "north east"),
-        topleft = ("at" => string((0.02, 0.98)), "anchor" => "north west"),
-        outertop = ("at" => string((0.5, 1.02)), "anchor" => "south"),
-        outerbottom = ("at" => string((0.5, -0.02)), "anchor" => "north"),
-        outerleft = ("at" => string((-0.02, 0.5)), "anchor" => "east"),
-        outerright = ("at" => string((1.02, 0.5)), "anchor" => "west"),
-        outerbottomleft = ("at" => string((-0.02, -0.02)), "anchor" => "north east"),
-        outerbottomright = ("at" => string((1.02, -0.02)), "anchor" => "north west"),
-        outertopright = ("at" => string((1.02, 1)), "anchor" => "north west"),
-        outertopleft = ("at" => string((-0.02, 1)), "anchor" => "north east"),
-    ),
-    Symbol(k),
-    ("at" => string((1.02, 1)), "anchor" => "north west"),
+const _pgfplotsx_legend_pos = KW(
+    :bottomleft => "south west",
+    :bottomright => "south east",
+    :topright => "north east",
+    :topleft => "north west",
+    :outertopright => "outer north east",
 )

+const _pgfx_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
+const _pgfx_framestyle_defaults = Dict(:semi => :box)
+
+# we use the anchors to define orientations for example to align left
+# one needs to use the right edge as anchor
+const _pgfx_annotation_halign =
+    KW(:center => "", :left => "right", :right => "left")
 ## --------------------------------------------------------------------------------------
 # Generates a colormap for pgfplots based on a ColorGradient
 pgfx_arrow(::Nothing) = "every arrow/.append style={-}"
@@ -684,24 +632,22 @@ function pgfx_filllegend!(series_opt, opt)
              }""")
 end

-pgfx_colormap(cl::PlotUtils.AbstractColorList) = pgfx_colormap(color_list(cl))
-function pgfx_colormap(v::Vector{<:Colorant})
-    join(map(v) do c
+function pgfx_colormap(grad::ColorGradient)
+    join(map(grad.colors) do c
        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c), blue(c))
    end, "\n")
 end
-function pgfx_colormap(cg::ColorGradient)
-    join(map(1:length(cg)) do i
-        @sprintf("rgb(%.8fcm)=(%.8f,%.8f,%.8f)", cg.values[i], red(cg.colors[i]), green(cg.colors[i]), blue(cg.colors[i]))
+function pgfx_colormap(grad::Vector{<:Colorant})
+    join(map(grad) do c
+        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c), blue(c))
    end, "\n")
 end

-
 function pgfx_framestyle(style::Symbol)
-    if style in (:box, :axes, :origin, :zerolines, :grid, :none)
+    if style in _pgfx_framestyles
        return style
    else
-        default_style = get((semi = :box,), style, :axes)
+        default_style = get(_pgfx_framestyle_defaults, style, :axes)
        @warn( "Framestyle :$style is not (yet) supported by the PGFPlotsX backend. :$default_style was cosen instead.",)
        default_style
    end
@@ -720,14 +666,14 @@ function pgfx_fillstyle(plotattributes, i = 1)
    PGFPlotsX.Options("fill" => cstr, "fill opacity" => a)
 end

-function pgfx_linestyle(linewidth::Real, color, α = 1, linestyle = :solid)
+function pgfx_linestyle(linewidth::Real, color, α = 1, linestyle = "solid")
    cstr = plot_color(color, α)
    a = alpha(cstr)
    return PGFPlotsX.Options(
        "color" => cstr,
        "draw opacity" => a,
        "line width" => linewidth,
-        pgfx_get_linestyle(linestyle) => nothing,
+        get(_pgfplotsx_linestyles, linestyle, "solid") => nothing,
    )
 end

@@ -745,7 +691,7 @@ function pgfx_font(fontsize, thickness_scaling = 1, font = "\\selectfont")
 end

 function pgfx_should_add_to_legend(series::Series)
-    series.plotattributes[:primary] &&
+    series.plotattributes[:primary] && series.plotattributes[:label] != "" &&
    !(
        series.plotattributes[:seriestype] in (
            :hexbin,
@@ -765,8 +711,10 @@ end

 function pgfx_marker(plotattributes, i = 1)
    shape = _cycle(plotattributes[:markershape], i)
-    cstr =
-        plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i))
+    cstr = plot_color(
+        get_markercolor(plotattributes, i),
+        get_markeralpha(plotattributes, i),
+    )
    a = alpha(cstr)
    cstr_stroke = plot_color(
        get_markerstrokecolor(plotattributes, i),
@@ -775,10 +723,11 @@ function pgfx_marker(plotattributes, i = 1)
    a_stroke = alpha(cstr_stroke)
    mark_size =
        pgfx_thickness_scaling(plotattributes) *
-        0.75 *
+        0.5 *
        _cycle(plotattributes[:markersize], i)
    return PGFPlotsX.Options(
-        "mark" => shape isa Shape ? "PlotsShape$i" : pgfx_get_marker(shape),
+        "mark" =>
+            shape isa Shape ? "PlotsShape$i" : get(_pgfplotsx_markers, shape, "*"),
        "mark size" => "$mark_size pt",
        "mark options" => PGFPlotsX.Options(
            "color" => cstr_stroke,
@@ -787,7 +736,6 @@ function pgfx_marker(plotattributes, i = 1)
            "fill opacity" => a,
            "line width" =>
                pgfx_thickness_scaling(plotattributes) *
-                0.75 *
                _cycle(plotattributes[:markerstrokewidth], i),
            "rotate" => if shape == :dtriangle
                180
@@ -798,7 +746,11 @@ function pgfx_marker(plotattributes, i = 1)
            else
                0
            end,
-            pgfx_get_linestyle(_cycle(plotattributes[:markerstrokestyle], i)) => nothing,
+            get(
+                _pgfplotsx_linestyles,
+                _cycle(plotattributes[:markerstrokestyle], i),
+                "solid",
+            ) => nothing,
        ),
    )
 end
@@ -812,8 +764,7 @@ function pgfx_add_annotation!(o, x, y, val, thickness_scaling = 1)
        [
            "\\node",
            PGFPlotsX.Options(
-                get((center = "", left = "right", right = "left"), val.font.halign, "") =>
-                    nothing,
+                get(_pgfx_annotation_halign, val.font.halign, "") => nothing,
                "color" => cstr,
                "draw opacity" => convert(Float16, a),
                "rotate" => val.font.rotation,
@@ -888,7 +839,7 @@ function pgfx_fillrange_series!(axis, series, series_func, i, fillrange, rng)
    fillrange_opt = merge(fillrange_opt, pgfx_marker(series, i))
    push!(fillrange_opt, "forget plot" => nothing)
    opt = series.plotattributes
-    args = RecipesPipeline.is3d(series) ? (opt[:x][rng], opt[:y][rng], opt[:z][rng]) :
+    args = is3d(series) ? (opt[:x][rng], opt[:y][rng], opt[:z][rng]) :
        (opt[:x][rng], opt[:y][rng])
    push!(
        axis,
@@ -911,57 +862,6 @@ function pgfx_fillrange_args(fillrange, x, y, z)
    z_fill = [z; _cycle(fillrange, n:-1:1); z[1]]
    return PGFPlotsX.Coordiantes(x_fill, y_fill, z_fill)
 end
-
-function pgfx_sanitize_string(p::PlotText)
-    PlotText(pgfx_sanitize_string(p.str), p.font)
-end
-function pgfx_sanitize_string(s::AbstractString)
-    s = replace(s, r"\\?\#" => "\\#")
-    s = replace(s, r"\\?\%" => "\\%")
-    s = replace(s, r"\\?\_" => "\\_")
-    s = replace(s, r"\\?\&" => "\\&")
-    s = replace(s, r"\\?\{" => "\\{")
-    s = replace(s, r"\\?\}" => "\\}")
-end
-@require LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" begin
-    using .LaTeXStrings
-    function pgfx_sanitize_string(s::LaTeXString)
-        s = replace(s, r"\\?\#" => "\\#")
-        s = replace(s, r"\\?\%" => "\\%")
-    end
-end
-function pgfx_sanitize_plot!(plt)
-        for (key, value) in plt.attr
-            if value isa Union{AbstractString, AbstractVector{<:AbstractString}}
-                plt.attr[key] = pgfx_sanitize_string.(value)
-            end
-        end
-        for subplot in plt.subplots
-            for (key, value) in subplot.attr
-                if key == :annotations && subplot.attr[:annotations] !== nothing
-                    old_ann = subplot.attr[key]
-                    for i in eachindex(old_ann)
-                        subplot.attr[key][i] = (old_ann[i][1], old_ann[i][2], pgfx_sanitize_string(old_ann[i][3]))
-                    end
-                elseif value isa Union{AbstractString, AbstractVector{<:AbstractString}}
-                    subplot.attr[key] = pgfx_sanitize_string.(value)
-                end
-            end
-        end
-        for series in plt.series_list
-            for (key, value) in series.plotattributes
-                if key == :series_annotations && series.plotattributes[:series_annotations] !== nothing
-                    old_ann = series.plotattributes[key].strs
-                    for i in eachindex(old_ann)
-                        series.plotattributes[key].strs[i] = pgfx_sanitize_string(old_ann[i])
-                    end
-                elseif value isa Union{AbstractString, AbstractVector{<:AbstractString}}
-                    series.plotattributes[key] = pgfx_sanitize_string.(value)
-                end
-            end
-        end
-        ##
-end
 # --------------------------------------------------------------------------------------
 function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
    axis = sp[Symbol(letter, :axis)]
@@ -972,21 +872,6 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
        "scaled $(letter) ticks" => "false",
        string(letter, :label) => axis[:guide],
    )
-    tick_color = plot_color(axis[:foreground_color_axis])
-    push!(opt,
-        "$(letter) tick style" => PGFPlotsX.Options(
-            "color" => color(tick_color),
-            "opacity" => alpha(tick_color),
-        ),
-    )
-    tick_label_color = plot_color(axis[:tickfontcolor])
-    push!(opt,
-        "$(letter) tick label style" => PGFPlotsX.Options(
-            "color" => color(tick_color),
-            "opacity" => alpha(tick_color),
-            "rotate" => axis[:rotation]
-        ),
-    )

    # set to supported framestyle
    framestyle = pgfx_framestyle(sp[:framestyle] == false ? :none : sp[:framestyle])
@@ -1027,8 +912,6 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
    # ticks on or off
    if axis[:ticks] in (nothing, false, :none) || framestyle == :none
        push!(opt, "$(letter)majorticks" => "false")
-    elseif framestyle in (:grid, :zerolines)
-        push!(opt, "$letter tick style" => PGFPlotsX.Options("draw" => "none"))
    end

    # grid on or off
@@ -1044,7 +927,6 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
    push!(opt, string(letter, :min) => lims[1], string(letter, :max) => lims[2])

    if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
-        # ticks
        ticks = get_ticks(sp, axis)
        #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
        tick_values =
@@ -1110,37 +992,6 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
                axis[:gridstyle],
            ),
        )
-
-        # minor ticks
-        # NOTE: PGFPlots would provide "minor x ticks num", but this only places minor ticks
-        #       between major ticks and not outside first and last tick to the axis limits.
-        #       Hence, we hack around with extra ticks. Unfortunately this conflicts with
-        #       `:zerolines` framestyle hack. So minor ticks are not working with
-        #       `:zerolines`.
-        minor_ticks = get_minor_ticks(sp, axis, ticks)
-        if minor_ticks !== nothing
-            minor_ticks =
-                ispolar(sp) && letter == :x ? [rad2deg.(minor_ticks)[3:end]..., 360, 405] :
-                minor_ticks
-            push!(
-                opt,
-                string("extra ", letter, " ticks") => string("{", join(minor_ticks, ","), "}"),
-            )
-            push!(opt, string("extra ", letter, " tick labels") => "")
-            push!(
-                opt,
-                string("extra ", letter, " tick style") => PGFPlotsX.Options(
-                    "grid" => axis[:minorgrid] ? "major" : "none",
-                    string(letter, " grid style") => pgfx_linestyle(
-                        pgfx_thickness_scaling(sp) * axis[:minorgridlinewidth],
-                        axis[:foreground_color_minor_grid],
-                        axis[:minorgridalpha],
-                        axis[:minorgridstyle],
-                    ),
-                    "major tick length" => typeof(axis[:minorticks]) <: Integer && axis[:minorticks] > 1 || axis[:minorticks] ? "0.1cm" : "0"
-                ),
-            )
-        end
    end

    # framestyle
@@ -1162,7 +1013,7 @@ function pgfx_axis!(opt::PGFPlotsX.Options, sp::Subplot, letter)
            opt,
            string("extra ", letter, " tick style") => PGFPlotsX.Options(
                "grid" => "major",
-                string(letter, " grid style") => pgfx_linestyle(
+                "major grid style" => pgfx_linestyle(
                    pgfx_thickness_scaling(sp),
                    axis[:foreground_color_border],
                    1.0,
@@ -1192,12 +1043,12 @@ end
 # Set the (left, top, right, bottom) minimum padding around the plot area
 # to fit ticks, tick labels, guides, colorbars, etc.
 function _update_min_padding!(sp::Subplot{PGFPlotsXBackend})
-    leg = sp[:legend]
-    if leg in (:best, :outertopright, :outerright, :outerbottomright) || (leg isa Tuple && leg[1] >= 1)
-        sp.minpad = (0mm, 0mm, 5mm, 0mm)
-    else
-        sp.minpad = (0mm, 0mm, 0mm, 0mm)
-    end
+    # TODO: make padding more intelligent
+    # TODO: how to include margins properly?
+    # sp.minpad = (50mm + sp[:left_margin],
+    #              0mm + sp[:top_margin],
+    #              50mm + sp[:right_margin],
+    #              0mm + sp[:bottom_margin])
 end

 function _create_backend_figure(plt::Plot{PGFPlotsXBackend})
@@ -3,11 +3,13 @@

 is_subplot_supported(::PlotlyBackend) = true
 # is_string_supported(::PlotlyBackend) = true
+const _plotly_framestyles = [:box, :axes, :zerolines, :grid, :none]
+const _plotly_framestyle_defaults = Dict(:semi => :box, :origin => :zerolines)
 function _plotly_framestyle(style::Symbol)
-    if style in (:box, :axes, :zerolines, :grid, :none)
+    if style in _plotly_framestyles
        return style
    else
-        default_style = get((semi = :box, origin = :zerolines), style, :axes)
+        default_style = get(_plotly_framestyle_defaults, style, :axes)
        @warn("Framestyle :$style is not supported by Plotly and PlotlyJS. :$default_style was cosen instead.")
        default_style
    end
@@ -15,25 +17,29 @@ end


 # --------------------------------------------------------------------------------------
+const plotly_remote_file_path = "https://cdn.plot.ly/plotly-latest.min.js"

+
+# if isatom()
+#     import Atom
+#     Atom.@msg evaljs(_js_code)
+# end
 using UUIDs

 # ----------------------------------------------------------------

-plotly_legend_pos(pos::Symbol) = get(
-    (
-        right = [1.0, 0.5],
-        left = [0.0, 0.5],
-        top = [0.5, 1.0],
-        bottom = [0.5, 0.0],
-        bottomleft = [0.0, 0.0],
-        bottomright = [1.0, 0.0],
-        topright = [1.0, 1.0],
-        topleft = [0.0, 1.0],
-    ),
-    pos,
-    [1.0, 1.0],
+const _plotly_legend_pos = KW(
+    :right => [1., 0.5],
+    :left => [0., 0.5],
+    :top => [0.5, 1.],
+    :bottom => [0.5, 0.],
+    :bottomleft => [0., 0.],
+    :bottomright => [1., 0.],
+    :topright => [1., 1.],
+    :topleft => [0., 1.]
 )
+
+plotly_legend_pos(pos::Symbol) = get(_plotly_legend_pos, pos, [1.,1.])
 plotly_legend_pos(v::Tuple{S,T}) where {S<:Real, T<:Real} = v

 function plotly_font(font::Font, color = font.color)
@@ -156,7 +162,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)

    if letter in (:x,:y)
        ax[:domain] = plotly_domain(sp, letter)
-        if RecipesPipeline.is3d(sp)
+        if is3d(sp)
            # don't link 3d axes for synchronized interactivity
            x_idx = y_idx = sp[:subplot_index]
        else
@@ -170,7 +176,7 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
    lims = axis_limits(sp, letter)

    if axis[:ticks] != :native || axis[:lims] != :auto
-        ax[:range] = map(RecipesPipeline.scale_func(axis[:scale]), lims)
+        ax[:range] = map(scalefunc(axis[:scale]), lims)
    end

    if !(axis[:ticks] in (nothing, :none, false))
@@ -239,7 +245,7 @@ function plotly_layout(plt::Plot)
        # but vertically just below the top of the subplot bounding box
        if sp[:title] != ""
            bb = plotarea(sp)
-            tpos = sp[:titlelocation]
+            tpos = sp[:title_location]
            xmm = if tpos == :left
                left(bb)
            elseif tpos == :right
@@ -257,8 +263,8 @@ function plotly_layout(plt::Plot)
        # set to supported framestyle
        sp[:framestyle] = _plotly_framestyle(sp[:framestyle])

-        # if any(RecipesPipeline.is3d, seriesargs)
-        if RecipesPipeline.is3d(sp)
+        # if any(is3d, seriesargs)
+        if is3d(sp)
            azim = sp[:camera][1] - 90 #convert azimuthal to match GR behaviour
            theta = 90 - sp[:camera][2] #spherical coordinate angle from z axis
            plotattributes_out[:scene] = KW(
@@ -344,44 +350,30 @@ function plotly_layout_json(plt::Plot)
 end


-plotly_colorscale(cg::ColorGradient, α = nothing) =
-    [[v, rgba_string(plot_color(cg.colors[v], α))] for v in cg.values]
-function plotly_colorscale(c::AbstractVector{<:Colorant}, α = nothing)
+function plotly_colorscale(grad::ColorGradient, α)
+    [[grad.values[i], rgba_string(plot_color(grad.colors[i], α))] for i in eachindex(grad.colors)]
+end
+plotly_colorscale(c::Colorant,α) = plotly_colorscale(_as_gradient(c),α)
+function plotly_colorscale(c::AbstractVector{<:RGBA}, α)
    if length(c) == 1
-        return [
-            [0.0, rgba_string(plot_color(c[1], α))],
-            [1.0, rgba_string(plot_color(c[1], α))],
-        ]
+        return [[0.0, rgba_string(plot_color(c[1], α))], [1.0, rgba_string(plot_color(c[1], α))]]
    else
-        vals = range(0.0, stop = 1.0, length = length(c))
+        vals = range(0.0, stop=1.0, length=length(c))
        return [[vals[i], rgba_string(plot_color(c[i], α))] for i in eachindex(c)]
    end
 end
-function plotly_colorscale(cg::PlotUtils.CategoricalColorGradient, α = nothing)
-    n = length(cg)
-    cinds = repeat(1:n, inner = 2)
-    vinds = vcat((i:(i + 1) for i in 1:n)...)
-    return [
-        [cg.values[vinds[i]], rgba_string(plot_color(color_list(cg)[cinds[i]], α))]
-        for i in eachindex(cinds)
-    ]
-end
-plotly_colorscale(c, α = nothing) = plotly_colorscale(_as_gradient(c), α)
+# plotly_colorscale(c, alpha = nothing) = plotly_colorscale(cgrad(), alpha)


-get_plotly_marker(k, def) = get(
-    (
-        rect = "square",
-        xcross = "x",
-        x = "x",
-        utriangle = "triangle-up",
-        dtriangle = "triangle-down",
-        star5 = "star-triangle-up",
-        vline = "line-ns",
-        hline = "line-ew",
-    ),
-    k,
-    def,
+const _plotly_markers = KW(
+    :rect       => "square",
+    :xcross     => "x",
+    :x          => "x",
+    :utriangle  => "triangle-up",
+    :dtriangle  => "triangle-down",
+    :star5      => "star-triangle-up",
+    :vline      => "line-ns",
+    :hline      => "line-ew",
 )

 # find indicies of axes to which the supblot links to
@@ -558,7 +550,7 @@ function plotly_series(plt::Plot, series::Series)
    if hasmarker
        inds = eachindex(x)
        plotattributes_out[:marker] = KW(
-            :symbol => get_plotly_marker(series[:markershape], string(series[:markershape])),
+            :symbol => get(_plotly_markers, series[:markershape], string(series[:markershape])),
            # :opacity => series[:markeralpha],
            :size => 2 * _cycle(series[:markersize], inds),
            :color => rgba_string.(plot_color.(get_markercolor.(series, inds), get_markeralpha.(series, inds))),
@@ -678,7 +670,7 @@ function plotly_series_segments(series::Series, plotattributes_base::KW, x, y, z
        # add "marker"
        if hasmarker
            plotattributes_out[:marker] = KW(
-                :symbol => get_plotly_marker(_cycle(series[:markershape], i), string(_cycle(series[:markershape], i))),
+                :symbol => get(_plotly_markers, _cycle(series[:markershape], i), string(_cycle(series[:markershape], i))),
                # :opacity => series[:markeralpha],
                :size => 2 * _cycle(series[:markersize], i),
                :color => rgba_string(plot_color(get_markercolor(series, clims, i), get_markeralpha(series, i))),
@@ -756,11 +748,11 @@ function plotly_colorbar_hack(series::Series, plotattributes_base::KW, sym::Symb
    plotattributes_out = deepcopy(plotattributes_base)
    cmin, cmax = get_clims(series[:subplot])
    plotattributes_out[:showlegend] = false
-    plotattributes_out[:type] = RecipesPipeline.is3d(series) ? :scatter3d : :scatter
+    plotattributes_out[:type] = is3d(series) ? :scatter3d : :scatter
    plotattributes_out[:hoverinfo] = :none
    plotattributes_out[:mode] = :markers
    plotattributes_out[:x], plotattributes_out[:y] = [series[:x][1]], [series[:y][1]]
-    if RecipesPipeline.is3d(series)
+    if is3d(series)
        plotattributes_out[:z] = [series[:z][1]]
    end
    # zrange = zmax == zmin ? 1 : zmax - zmin # if all marker_z values are the same, plot all markers same color (avoids division by zero in next line)
@@ -817,8 +809,7 @@ const ijulia_initialized = Ref(false)

 function plotly_html_head(plt::Plot)
    local_file = ("file://" * plotly_local_file_path)
-    plotly =
-        use_local_dependencies[] ? local_file : "https://cdn.plot.ly/plotly-latest.min.js"
+    plotly = use_local_dependencies[] ? local_file : plotly_remote_file_path
    if isijulia() && !ijulia_initialized[]
        # using requirejs seems to be key to load a js depency in IJulia!
        # https://requirejs.org/docs/start.html
@@ -19,12 +19,14 @@ end

 # ------------------------------------------------------------------------------

-for (mime, fmt) in (
+const _plotlyjs_mimeformats = Dict(
    "application/pdf" => "pdf",
    "image/png"       => "png",
    "image/svg+xml"   => "svg",
    "image/eps"       => "eps",
 )
+
+for (mime, fmt) in _plotlyjs_mimeformats
    @eval _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plotlyjs_syncplot(plt), format = $fmt)
 end

@@ -38,9 +40,11 @@ _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standal

 _display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))

-function PlotlyJS.WebIO.render(plt::Plot{PlotlyJSBackend})
-    plt_html = sprint(show, MIME("text/html"), plt)
-    return PlotlyJS.WebIO.render(PlotlyJS.WebIO.dom"div"(innerHTML=plt_html))
+@require WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" begin
+    function WebIO.render(plt::Plot{PlotlyJSBackend})
+        prepare_output(plt)
+        WebIO.render(plt.o)
+    end
 end

 function closeall(::PlotlyJSBackend)
@@ -1,3 +1,6 @@
+# Do "using PyPlot: PyCall, LaTeXStrings" without dependency warning:
+const PyCall = PyPlot.PyCall
+const LaTeXStrings = PyPlot.LaTeXStrings

 # https://github.com/stevengj/PyPlot.jl

@@ -32,7 +35,7 @@ else
 end

 # PyCall API changes in v1.90.0
-if !isdefined(PyPlot.PyCall, :_setproperty!)
+if !isdefined(PyCall, :_setproperty!)
    @warn "Plots no longer supports PyCall < 1.90.0 and PyPlot < 2.8.0. Either update PyCall and PyPlot or pin Plots to a version <= 0.23.2."
 end

@@ -61,23 +64,16 @@ end
 py_color(s) = py_color(parse(Colorant, string(s)))
 py_color(c::Colorant) = (red(c), green(c), blue(c), alpha(c))
 py_color(cs::AVec) = map(py_color, cs)
-py_color(grad::PlotUtils.AbstractColorList) = py_color(color_list(grad))
+py_color(grad::ColorGradient) = py_color(grad.colors)
 py_color(c::Colorant, α) = py_color(plot_color(c, α))

-function py_colormap(cg::ColorGradient)
-    pyvals = collect(zip(cg.values, py_color(PlotUtils.color_list(cg))))
+function py_colormap(grad::ColorGradient)
+    pyvals = [(z, py_color(grad[z])) for z in grad.values]
    cm = pycolors."LinearSegmentedColormap"."from_list"("tmp", pyvals)
    cm."set_bad"(color=(0,0,0,0.0), alpha=0.0)
    cm
 end
-function py_colormap(cg::PlotUtils.CategoricalColorGradient)
-    r = range(0, stop = 1, length = 256)
-    pyvals = collect(zip(r, py_color(cg[r])))
-    cm = pycolors."LinearSegmentedColormap"."from_list"("tmp", pyvals)
-    cm."set_bad"(color=(0,0,0,0.0), alpha=0.0)
-    cm
-end
-py_colormap(c) = py_colormap(_as_gradient(c))
+py_colormap(c::Colorant) = py_colormap(_as_gradient(c))


 function py_shading(c, z)
@@ -109,6 +105,32 @@ function py_marker(marker::Shape)
    pypath."Path"(mat)
 end

+const _path_MOVETO = UInt8(1)
+const _path_LINETO = UInt8(2)
+const _path_CLOSEPOLY = UInt8(79)
+
+# # see http://matplotlib.org/users/path_tutorial.html
+# # and http://matplotlib.org/api/path_api.html#matplotlib.path.Path
+# function py_path(x, y)
+#     n = length(x)
+#     mat = zeros(n+1, 2)
+#     codes = zeros(UInt8, n+1)
+#     lastnan = true
+#     for i=1:n
+#         mat[i,1] = x[i]
+#         mat[i,2] = y[i]
+#         nan = !ok(x[i], y[i])
+#         codes[i] = if nan && i>1
+#             _path_CLOSEPOLY
+#         else
+#             lastnan ? _path_MOVETO : _path_LINETO
+#         end
+#         lastnan = nan
+#     end
+#     codes[n+1] = _path_CLOSEPOLY
+#     pypath["Path"](mat, codes)
+# end
+
 # get the marker shape
 function py_marker(marker::Symbol)
    marker == :none && return " "
@@ -175,11 +197,11 @@ end

 function labelfunc(scale::Symbol, backend::PyPlotBackend)
    if scale == :log10
-        x -> PyPlot.LaTeXStrings.latexstring("10^{$x}")
+        x -> LaTeXStrings.latexstring("10^{$x}")
    elseif scale == :log2
-        x -> PyPlot.LaTeXStrings.latexstring("2^{$x}")
+        x -> LaTeXStrings.latexstring("2^{$x}")
    elseif scale == :ln
-        x -> PyPlot.LaTeXStrings.latexstring("e^{$x}")
+        x -> LaTeXStrings.latexstring("e^{$x}")
    else
        string
    end
@@ -187,7 +209,7 @@ end

 function py_mask_nans(z)
    # pynp["ma"][:masked_invalid](z)))
-    PyPlot.PyCall.pycall(pynp."ma"."masked_invalid", Any, z)
+    PyCall.pycall(pynp."ma"."masked_invalid", Any, z)
    # pynp["ma"][:masked_where](pynp["isnan"](z),z)
 end

@@ -207,6 +229,11 @@ function fix_xy_lengths!(plt::Plot{PyPlotBackend}, series::Series)
    end
 end

+py_linecolor(series::Series)          = py_color(series[:linecolor])
+py_markercolor(series::Series)        = py_color(series[:markercolor])
+py_markerstrokecolor(series::Series)  = py_color(series[:markerstrokecolor])
+py_fillcolor(series::Series)          = py_color(series[:fillcolor])
+
 py_linecolormap(series::Series)       = py_colormap(series[:linecolor])
 py_markercolormap(series::Series)     = py_colormap(series[:markercolor])
 py_fillcolormap(series::Series)       = py_colormap(series[:fillcolor])
@@ -421,7 +448,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            #         :norm => pycolors["Normalize"](; extrakw...)
            #     )
            #     lz = _cycle(series[:line_z], 1:n)
-            #     handle = if RecipesPipeline.is3d(st)
+            #     handle = if is3d(st)
            #         line_segments = [[(x[j], y[j], z[j]) for j in rng] for rng in segments]
            #         lc = pyart3d["Line3DCollection"](line_segments; kw...)
            #         lc[:set_array](lz)
@@ -451,7 +478,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            # end

            a = series[:arrow]
-            if a !== nothing && !RecipesPipeline.is3d(st)  # TODO: handle 3d later
+            if a !== nothing && !is3d(st)  # TODO: handle 3d later
                if typeof(a) != Arrow
                    @warn("Unexpected type for arrow: $(typeof(a))")
                else
@@ -459,8 +486,8 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                        :arrowstyle => "simple,head_length=$(a.headlength),head_width=$(a.headwidth)",
                        :shrinkA => 0,
                        :shrinkB => 0,
-                        :edgecolor => py_color(get_linecolor(series)),
-                        :facecolor => py_color(get_linecolor(series)),
+                        :edgecolor => py_linecolor(series),
+                        :facecolor => py_linecolor(series),
                        :linewidth => py_thickness_scale(plt, get_linewidth(series)),
                        :linestyle => py_linestyle(st, get_linestyle(series)),
                    )
@@ -506,19 +533,16 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            handle = []
            x,y = xyargs
            shapes = series[:markershape]
-            msc = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series))
+            msc = py_markerstrokecolor(series)
            lw = py_thickness_scale(plt, series[:markerstrokewidth])
            for i=eachindex(y)
-                if series[:marker_z] !== nothing
-                    extrakw[:c] = [py_color(get_markercolor(series, i), get_markercoloralpha(series, i))]
-                end
+                extrakw[:c] = _cycle(markercolor, i)

                push!(handle, ax."scatter"(_cycle(x,i), _cycle(y,i);
                    label = series[:label],
                    zorder = series[:series_plotindex] + 0.5,
                    marker = py_marker(_cycle(shapes,i)),
                    s =  py_thickness_scale(plt, _cycle(series[:markersize],i) .^ 2),
-                    facecolors = py_color(get_markercolor(series, i), get_markercoloralpha(series, i)),
                    edgecolors = msc,
                    linewidths = lw,
                    extrakw...
@@ -558,7 +582,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                  zorder = series[:series_plotindex] + 0.5,
                  marker = prev_marker,
                  s = cur_scale_list,
-                  edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),  # Do we need include i?
+                  edgecolors = py_markerstrokecolor(series),
                  linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                  facecolors = cur_color_list,
                  extrakw...
@@ -579,7 +603,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex] + 0.5,
                marker = prev_marker,
                s = cur_scale_list,
-                edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
+                edgecolors = py_markerstrokecolor(series),
                linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                facecolors = cur_color_list,
                extrakw...
@@ -594,7 +618,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex] + 0.5,
                marker = py_marker(series[:markershape]),
                s = py_thickness_scale(plt, series[:markersize] .^ 2),
-                edgecolors = py_color(get_markerstrokecolor(series), get_markerstrokealpha(series)),
+                edgecolors = py_markerstrokecolor(series),
                linewidths = py_thickness_scale(plt, series[:markerstrokewidth]),
                extrakw...
            )
@@ -608,7 +632,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            zorder = series[:series_plotindex],
            gridsize = series[:bins],
            linewidths = py_thickness_scale(plt, series[:linewidth]),
-            edgecolors = py_color(get_linecolor(series)),
+            edgecolors = py_linecolor(series),
            cmap = py_fillcolormap(series),  # applies to the pcolorfast object
            extrakw...
        )
@@ -681,7 +705,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                rstride = series[:stride][1],
                cstride = series[:stride][2],
                linewidth = py_thickness_scale(plt, series[:linewidth]),
-                edgecolor = py_color(get_linecolor(series)),
+                edgecolor = py_linecolor(series),
                extrakw...
            )
            push!(handles, handle)
@@ -707,7 +731,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                zorder = series[:series_plotindex],
                cmap = py_fillcolormap(series),
                linewidth = py_thickness_scale(plt, series[:linewidth]),
-                edgecolor = py_color(get_linecolor(series)),
+                edgecolor = py_linecolor(series),
                extrakw...
            )
            push!(handles, handle)
@@ -729,7 +753,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
        end
        handle = ax."imshow"(z;
            zorder = series[:series_plotindex],
-            cmap = py_colormap(cgrad(plot_color([:black, :white]))),
+            cmap = py_colormap(cgrad([:black, :white])),
            vmin = 0.0,
            vmax = 1.0,
            extent = (xmin-0.5, xmax+0.5, ymax+0.5, ymin-0.5)
@@ -915,7 +939,7 @@ function py_set_axis_colors(sp, ax, a::Axis)
        spine."set_color"(py_color(a[:foreground_color_border]))
    end
    axissym = Symbol(a[:letter], :axis)
-    if PyPlot.PyCall.hasproperty(ax, axissym)
+    if PyCall.hasproperty(ax, axissym)
        tickcolor = sp[:framestyle] in (:zerolines, :grid) ? py_color(plot_color(a[:foreground_color_grid], a[:gridalpha])) : py_color(a[:foreground_color_axis])
        ax."tick_params"(axis=string(a[:letter]), which="both",
                         colors=tickcolor,
@@ -965,7 +989,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})

        # title
        if sp[:title] != ""
-            loc = lowercase(string(sp[:titlelocation]))
+            loc = lowercase(string(sp[:title_location]))
            func = if loc == "left"
                :_left_title
            elseif loc == "right"
@@ -1026,7 +1050,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
        end

        # framestyle
-        if !ispolar(sp) && !RecipesPipeline.is3d(sp)
+        if !ispolar(sp) && !is3d(sp)
            ax.spines["left"]."set_linewidth"(py_thickness_scale(plt, 1))
            ax.spines["bottom"]."set_linewidth"(py_thickness_scale(plt, 1))
            if sp[:framestyle] == :semi
@@ -1056,7 +1080,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
        # axis attributes
        for letter in (:x, :y, :z)
            axissym = Symbol(letter, :axis)
-            PyPlot.PyCall.hasproperty(ax, axissym) || continue
+            PyCall.hasproperty(ax, axissym) || continue
            axis = sp[axissym]
            pyaxis = getproperty(ax, axissym)
            if axis[:mirror] && letter != :z
@@ -1079,23 +1103,13 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                ticks[2][ticks[1] .== 0] .= ""
            end
            axis[:ticks] != :native ? py_set_ticks(ax, ticks, letter) : nothing
-
-            intensity = 0.5  # This value corresponds to scaling of other grid elements
-            pyaxis."set_tick_params"(direction = axis[:tick_direction] == :out ? "out" : "in", width=py_thickness_scale(plt, intensity))
-
+            pyaxis."set_tick_params"(direction = axis[:tick_direction] == :out ? "out" : "in")
            getproperty(ax, Symbol("set_", letter, "label"))(axis[:guide])
            if get(axis.plotattributes, :flip, false)
                getproperty(ax, Symbol("invert_", letter, "axis"))()
            end
            pyaxis."label"."set_fontsize"(py_thickness_scale(plt, axis[:guidefontsize]))
            pyaxis."label"."set_family"(axis[:guidefontfamily])
-
-            if (letter == :y && !RecipesPipeline.is3d(sp))
-                pyaxis."label"."set_rotation"(axis[:guidefontrotation] + 90)
-            else
-                pyaxis."label"."set_rotation"(axis[:guidefontrotation])
-            end
-
            for lab in getproperty(ax, Symbol("get_", letter, "ticklabels"))()
                lab."set_fontsize"(py_thickness_scale(plt, axis[:tickfontsize]))
                lab."set_family"(axis[:tickfontfamily])
@@ -1112,35 +1126,6 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            else
                pyaxis."grid"(false)
            end
-            #
-
-            if axis[:minorticks] > 1
-                pyaxis."set_minor_locator"(PyPlot.matplotlib.ticker.AutoMinorLocator(axis[:minorticks]))
-                pyaxis."set_tick_params"(
-                    which = "minor",
-                    direction = axis[:tick_direction] == :out ? "out" : "in",
-                    width=py_thickness_scale(plt, intensity))
-            end
-
-            if axis[:minorgrid]
-                if !(axis[:minorticks] > 1)  # Check if ticks were already configured
-                    ax."minorticks_on"()
-                end
-                pyaxis."set_tick_params"(
-                    which = "minor",
-                    direction = axis[:tick_direction] == :out ? "out" : "in",
-                    width=py_thickness_scale(plt, intensity))
-
-                pyaxis."grid"(true,
-                    which = "minor",
-                    color = fgcolor,
-                    linestyle = py_linestyle(:line, axis[:minorgridstyle]),
-                    linewidth = py_thickness_scale(plt, axis[:minorgridlinewidth]),
-                    alpha = axis[:minorgridalpha])
-            end
-
-
-
            py_set_axis_colors(sp, ax, axis)
        end

@@ -1176,7 +1161,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
        end

        #camera/view angle
-        if RecipesPipeline.is3d(sp)
+        if is3d(sp)
            #convert azimuthal to match GR behaviour
            #view_init(elevation, azimuthal) so reverse :camera args
            ax."view_init"((sp[:camera].-(90,0))[end:-1:1]...)
@@ -1264,44 +1249,43 @@ end

 # -----------------------------------------------------------------

-py_legend_pos(pos::Symbol) = get(
-    (
-        right = "right",
-        left = "center left",
-        top = "upper center",
-        bottom = "lower center",
-        bottomleft = "lower left",
-        bottomright = "lower right",
-        topright = "upper right",
-        topleft = "upper left",
-        outerright = "center left",
-        outerleft = "right",
-        outertop = "lower center",
-        outerbottom = "upper center",
-        outerbottomleft = "lower right",
-        outerbottomright = "lower left",
-        outertopright = "upper left",
-        outertopleft = "upper right",
-    ),
-    pos,
-    "best",
+const _pyplot_legend_pos = KW(
+    :right => "right",
+    :left => "center left",
+    :top => "upper center",
+    :bottom => "lower center",
+    :bottomleft => "lower left",
+    :bottomright => "lower right",
+    :topright => "upper right",
+    :topleft => "upper left"
+  )
+
+const _pyplot_legend_pos_outer = KW(
+    :outerright => "center left",
+    :outerleft => "right",
+    :outertop => "lower center",
+    :outerbottom => "upper center",
+    :outerbottomleft => "lower right",
+    :outerbottomright => "lower left",
+    :outertopright => "upper left",
+    :outertopleft => "upper right"
 )
+
+py_legend_pos(pos::Symbol) = get(_pyplot_legend_pos, pos, get(_pyplot_legend_pos_outer, pos, "best"))
 py_legend_pos(pos) = "lower left"

-py_legend_bbox(pos::Symbol) = get(
-    (
-        outerright = (1.0, 0.5, 0.0, 0.0),
-        outerleft = (-0.15, 0.5, 0.0, 0.0),
-        outertop = (0.5, 1.0, 0.0, 0.0),
-        outerbottom = (0.5, -0.15, 0.0, 0.0),
-        outerbottomleft = (-0.15, 0.0, 0.0, 0.0),
-        outerbottomright = (1.0, 0.0, 0.0, 0.0),
-        outertopright = (1.0, 1.0, 0.0, 0.0),
-        outertopleft = (-0.15, 1.0, 0.0, 0.0),
-    ),
-    pos,
-    (0.0, 0.0, 1.0, 1.0),
+const _pyplot_legend_bbox_outer = KW(
+    :outerright => (1.0, 0.5, 0.0, 0.0),
+    :outerleft => (-0.15, 0.5, 0.0, 0.0),
+    :outertop => (0.5, 1.0, 0.0, 0.0),
+    :outerbottom => (0.5, -0.15, 0.0, 0.0),
+    :outerbottomleft => (-0.15, 0.0, 0.0, 0.0),
+    :outerbottomright => (1.0, 0.0, 0.0, 0.0),
+    :outertopright => (1.0, 1.0, 0.0, 0.0),
+    :outertopleft => (-0.15, 1.0, 0.0, 0.0)
 )
+
+py_legend_bbox(pos::Symbol) = get(_pyplot_legend_bbox_outer, pos, (0.0, 0.0, 1.0, 1.0))
 py_legend_bbox(pos) = pos

 function py_add_legend(plt::Plot, sp::Subplot, ax)
@@ -1314,29 +1298,25 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
            if should_add_to_legend(series)
                clims = get_clims(sp, series)
                # add a line/marker and a label
-                push!(handles,
-                    if series[:seriestype] == :shape || series[:fillrange] !== nothing
-                        pypatches."Patch"(
-                            edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
-                            facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
-                            linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
-                            linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
-                        )
-                    elseif series[:seriestype] in (:path, :straightline, :scatter)
-                        PyPlot.plt."Line2D"((0,1),(0,0),
-                            color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
-                            linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
-                            linestyle = py_linestyle(:path, get_linestyle(series)),
-                            marker = py_marker(_cycle(series[:markershape], 1)),
-                            # markersize = py_thickness_scale(plt, series[:markersize]), # In case we decide that markersize needs to be scaled in the legend too
-                            markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
-                            markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series)),
-                            markeredgewidth = py_thickness_scale(plt, series[:markerstrokewidth])
-                        )
-                    else
-                        series[:serieshandle][1]
-                    end
-                )
+                push!(handles, if series[:seriestype] == :shape || series[:fillrange] !== nothing
+                    pypatches."Patch"(
+                        edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
+                        facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
+                        linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
+                    )
+                elseif series[:seriestype] in (:path, :straightline, :scatter)
+                    PyPlot.plt."Line2D"((0,1),(0,0),
+                        color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
+                        linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
+                        linestyle = py_linestyle(:path, get_linestyle(series)),
+                        marker = py_marker(first(series[:markershape])),
+                        markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
+                        markerfacecolor = py_color(single_color(get_markercolor(series, clims)), get_markeralpha(series))
+                    )
+                else
+                    series[:serieshandle][1]
+                end)
                push!(labels, series[:label])
            end
        end
@@ -1352,7 +1332,6 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                facecolor = py_color(sp[:background_color_legend]),
                edgecolor = py_color(sp[:foreground_color_legend]),
                framealpha = alpha(plot_color(sp[:background_color_legend])),
-                fancybox = false  # makes the legend box square
            )
            frame = leg."get_frame"()
            frame."set_linewidth"(py_thickness_scale(plt, 1))
@@ -1403,7 +1382,8 @@ end
 _display(plt::Plot{PyPlotBackend}) = plt.o."show"()


-for (mime, fmt) in (
+
+const _pyplot_mimeformats = Dict(
    "application/eps"         => "eps",
    "image/eps"               => "eps",
    "application/pdf"         => "pdf",
@@ -1412,6 +1392,9 @@ for (mime, fmt) in (
    "image/svg+xml"           => "svg",
    "application/x-tex"       => "pgf"
 )
+
+
+for (mime, fmt) in _pyplot_mimeformats
    @eval function _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{PyPlotBackend})
        fig = plt.o
        fig."canvas"."print_figure"(
@@ -3,17 +3,19 @@


 # don't warn on unsupported... there's just too many warnings!!
-warn_on_unsupported_args(::UnicodePlotsBackend, plotattributes::KW) = nothing
+warnOnUnsupported_args(::UnicodePlotsBackend, plotattributes::KW) = nothing

 # --------------------------------------------------------------------------------------

+const _canvas_type = Ref(:auto)
+
 function _canvas_map()
-    (
-        braille = UnicodePlots.BrailleCanvas,
-        ascii = UnicodePlots.AsciiCanvas,
-        block = UnicodePlots.BlockCanvas,
-        dot = UnicodePlots.DotCanvas,
-        density = UnicodePlots.DensityCanvas,
+    KW(
+        :braille => UnicodePlots.BrailleCanvas,
+        :ascii => UnicodePlots.AsciiCanvas,
+        :block => UnicodePlots.BlockCanvas,
+        :dot => UnicodePlots.DotCanvas,
+        :density => UnicodePlots.DensityCanvas,
    )
 end

@@ -124,7 +126,7 @@ function addUnicodeSeries!(o, plotattributes, addlegend::Bool, xlim, ylim)
    color = plotattributes[:linecolor] in UnicodePlots.color_cycle ? plotattributes[:linecolor] : :auto

    # add the series
-    x, y = RecipesPipeline.unzip(collect(Base.Iterators.filter(xy->isfinite(xy[1])&&isfinite(xy[2]), zip(x,y))))
+    x, y = Plots.unzip(collect(Base.Iterators.filter(xy->isfinite(xy[1])&&isfinite(xy[2]), zip(x,y))))
    func(o, x, y; color = color, name = label)
 end

@@ -29,7 +29,7 @@ end

 Construct a polygon to be plotted
 """
-Shape(verts::AVec) = Shape(RecipesPipeline.unzip(verts)...)
+Shape(verts::AVec) = Shape(unzip(verts)...)
 Shape(s::Shape) = deepcopy(s)

 get_xs(shape::Shape) = shape.x
@@ -594,9 +594,7 @@ function process_annotation(sp::Subplot, xs, ys, labs, font = font())
    xlength = length(methods(length, (typeof(xs),))) == 0 ? 1 : length(xs)
    ylength = length(methods(length, (typeof(ys),))) == 0 ? 1 : length(ys)
    for i in 1:max(xlength, ylength, length(labs))
-      x, y, lab = _cycle(xs, i), _cycle(ys, i), _cycle(labs, i)
-        x = typeof(x) <: TimeType ? Dates.value(x) : x
-        y = typeof(y) <: TimeType ? Dates.value(y) : y
+        x, y, lab = _cycle(xs, i), _cycle(ys, i), _cycle(labs, i)
        if lab == :auto
            alphabet = "abcdefghijklmnopqrstuvwxyz"
            push!(anns, (x, y, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
@@ -672,9 +670,6 @@ end
 # ..(a::T, b::T) = (a,b)


-
-# -----------------------------------------------------------------------
-
 # style is :open or :closed (for now)
 struct Arrow
    style::Symbol
@@ -735,6 +730,7 @@ function add_arrows(func::Function, x::AVec, y::AVec)
    end
 end

+
 # -----------------------------------------------------------------------
 "create a BezierCurve for plotting"
 mutable struct BezierCurve{T <: GeometryTypes.Point}
@@ -752,7 +748,7 @@ end

@deprecate curve_points coords

-coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, Base.range(first(range), stop=last(range), length=n))
+coords(curve::BezierCurve, n::Integer = 30; range = [0,1]) = map(curve, Base.range(range..., length=n))

 # build a BezierCurve which leaves point p vertically upwards and arrives point q vertically upwards.
 # may create a loop if necessary.  Assumes the view is [0,1]
@@ -74,7 +74,7 @@ const _examples = PlotExample[
                        rand(11, 4),
                        lab = "lines",
                        w = 3,
-                        palette = cgrad(:grays),
+                        palette = :grays,
                        fill = 0,
                        α = 0.6,
                    )
@@ -322,7 +322,7 @@ const _examples = PlotExample[
                    plot(
                        Plots.fakedata(100, 10),
                        layout = 4,
-                        palette = cgrad.([:grays :blues :heat :lightrainbow]),
+                        palette = [:grays :blues :heat :lightrainbow],
                        bg_inside = [:orange :pink :darkblue :black],
                    )
                end
@@ -586,7 +586,7 @@ const _examples = PlotExample[
                        rand(100, 6),
                        layout = @layout([a b; c]),
                        title = ["A" "B" "C"],
-                        titlelocation = :left,
+                        title_location = :left,
                        left_margin = [20mm 0mm],
                        bottom_margin = 10px,
                        xrotation = 60,
@@ -875,139 +875,24 @@ const _examples = PlotExample[
            end,
        ],
    ),
-    PlotExample(
-        "Array Types",
-        "Plots supports different `Array` types that follow the `AbstractArray` interface, like `StaticArrays` and `OffsetArrays.`",
-        [
-            quote
-                begin
-                    using StaticArrays, OffsetArrays
-                    sv = SVector{10}(rand(10))
-                    ov = OffsetVector(rand(10), -2)
-                    plot([sv, ov], label = ["StaticArray" "OffsetArray"])
-                end
-            end,
-        ],
-    ),
-    PlotExample(
-        "Setting defaults and font arguments",
-        "",
-        [
-            quote
-                begin
-                    using Plots
-                    default(
-                        titlefont = (20, "times"),
-                        legendfontsize = 18,
-                        guidefont = (18, :darkgreen),
-                        tickfont = (12, :orange),
-                        guide = "x",
-                        framestyle = :zerolines,
-                        yminorgrid = true
-                    )
-                    plot(
-                        [sin, cos],
-                        -2π,
-                        2π,
-                        label = ["sin(θ)" "cos(θ)"],
-                        title = "Trigonometric Functions",
-                        xlabel = "θ",
-                        linewidth = 2,
-                        legend = :outertopleft,
-                    )
-                end
-            end,
-        ],
-    ),
-    PlotExample(
-        "Heatmap with DateTime axis",
-        "",
-        [
-            quote
-                begin
-                    using Dates
-                    z = rand(5, 5)
-                    x = DateTime.(2016:2020)
-                    y = 1:5
-                    heatmap(x, y, z)
-                end
-            end,
-        ],
-    ),
-    PlotExample(
-        "Linked axes",
-        "",
-        [
-            quote
-                begin
-                    x = -5:0.1:5
-                    plot(plot(x, x->x^2), plot(x, x->sin(x)), layout = 2, link = :y)
-                end
-            end,
-        ],
-    ),
-    PlotExample(
-        "Error bars and array type recipes",
-        "",
-        [
-            quote
-                begin
-                    struct Measurement <: Number
-                        val::Float64
-                        err::Float64
-                    end
-                    value(m::Measurement) = m.val
-                    uncertainty(m::Measurement) = m.err
-
-                    @recipe function f(::Type{T}, m::T) where T <: AbstractArray{<:Measurement}
-                        if !(get(plotattributes, :seriestype, :path) in [:contour, :contourf, :contour3d, :heatmap, :surface, :wireframe, :image])
-                            error_sym = Symbol(plotattributes[:letter], :error)
-                            plotattributes[error_sym] = uncertainty.(m)
-                        end
-                        value.(m)
-                    end
-
-                    x = Measurement.(10sort(rand(10)), rand(10))
-                    y = Measurement.(10sort(rand(10)), rand(10))
-                    z = Measurement.(10sort(rand(10)), rand(10))
-                    surf = Measurement.((1:10) .* (1:10)', rand(10,10))
-
-                    plot(
-                        scatter(x, [x y], msw = 0),
-                        scatter(x, y, z, msw = 0),
-                        heatmap(x, y, surf),
-                        wireframe(x, y, surf),
-                        legend = :topleft
-                    )
-                end
-            end,
-        ],
-    ),
 ]

 # Some constants for PlotDocs and PlotReferenceImages
-_animation_examples = [2, 31]
+_animation_examples = [2, 30]
 _backend_skips = Dict(
    :gr => [25, 30],
-    :pyplot => [2, 25, 30, 31],
+    :pyplot => [25, 30],
    :plotlyjs => [2, 21, 24, 25, 30, 31],
    :plotly => [2, 21, 24, 25, 30, 31],
    :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30, 31, 34, 37, 38, 39],
-    :pgfplotsx => [
-        2, # animation
-        6, # images
-        10, # histogram2d
-        16, # pgfplots thinks the upper panel is too small
-        22, # contourf
-        23, # pie
-        25, # @df
-        30, # @df
-        31, # animation
-        32, # spy
-        38, # histogram2d
-        45, # wireframe
-    ],
-)
+    :pgfplotsx => [ 6, # images
+                    10, # histogram2d
+                    20, # annotations due to missing sanitation
+                    22, # contourf
+                    23, # pie
+                    32, # spy
+                    38, # histogram2d
+                  ] )



@@ -3,7 +3,7 @@ using REPL

 function _plots_defaults()
    if isdefined(Main, :PLOTS_DEFAULTS)
-        copy(Dict{Symbol,Any}(Main.PLOTS_DEFAULTS))
+        Dict{Symbol,Any}(Main.PLOTS_DEFAULTS)
    else
        Dict{Symbol,Any}()
    end
@@ -13,9 +13,11 @@ end
 function __init__()
    user_defaults = _plots_defaults()
    if haskey(user_defaults, :theme)
-        theme(pop!(user_defaults, :theme))
+        theme(user_defaults[:theme])
+    end
+    for (k,v) in user_defaults
+        k == :theme || default(k, v)
    end
-    default(; user_defaults...)

    insert!(Base.Multimedia.displays, findlast(x -> x isa Base.TextDisplay || x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())

@@ -1,62 +1,57 @@

+
 defaultOutputFormat(plt::Plot) = "png"

 function png(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "png")
-    io = open(fn, "w")
-    show(io, MIME("image/png"), plt)
-    close(io)
+  fn = addExtension(fn, "png")
+  io = open(fn, "w")
+  show(io, MIME("image/png"), plt)
+  close(io)
 end
 png(fn::AbstractString) = png(current(), fn)

 function svg(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "svg")
-    io = open(fn, "w")
-    show(io, MIME("image/svg+xml"), plt)
-    close(io)
+  fn = addExtension(fn, "svg")
+  io = open(fn, "w")
+  show(io, MIME("image/svg+xml"), plt)
+  close(io)
 end
 svg(fn::AbstractString) = svg(current(), fn)

+
 function pdf(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "pdf")
-    io = open(fn, "w")
-    show(io, MIME("application/pdf"), plt)
-    close(io)
+  fn = addExtension(fn, "pdf")
+  io = open(fn, "w")
+  show(io, MIME("application/pdf"), plt)
+  close(io)
 end
 pdf(fn::AbstractString) = pdf(current(), fn)

+
 function ps(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "ps")
-    io = open(fn, "w")
-    show(io, MIME("application/postscript"), plt)
-    close(io)
+  fn = addExtension(fn, "ps")
+  io = open(fn, "w")
+  show(io, MIME("application/postscript"), plt)
+  close(io)
 end
 ps(fn::AbstractString) = ps(current(), fn)

 function eps(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "eps")
-    io = open(fn, "w")
-    show(io, MIME("image/eps"), plt)
-    close(io)
+  fn = addExtension(fn, "eps")
+  io = open(fn, "w")
+  show(io, MIME("image/eps"), plt)
+  close(io)
 end
 eps(fn::AbstractString) = eps(current(), fn)

 function tex(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "tex")
-    io = open(fn, "w")
-    show(io, MIME("application/x-tex"), plt)
-    close(io)
+  fn = addExtension(fn, "tex")
+  io = open(fn, "w")
+  show(io, MIME("application/x-tex"), plt)
+  close(io)
 end
 tex(fn::AbstractString) = tex(current(), fn)

-function json(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "json")
-    io = open(fn, "w")
-    show(io, MIME("application/vnd.plotly.v1+json"), plt)
-    close(io)
-end
-json(fn::AbstractString) = json(current(), fn)
-
 function html(plt::Plot, fn::AbstractString)
    fn = addExtension(fn, "html")
    io = open(fn, "w")
@@ -66,39 +61,47 @@ end
 html(fn::AbstractString) = html(current(), fn)

 function txt(plt::Plot, fn::AbstractString)
-    fn = addExtension(fn, "txt")
-    io = open(fn, "w")
-    show(io, MIME("text/plain"), plt)
-    close(io)
+  fn = addExtension(fn, "txt")
+  io = open(fn, "w")
+  show(io, MIME("text/plain"), plt)
+  close(io)
 end
 txt(fn::AbstractString) = txt(current(), fn)

-
 # ----------------------------------------------------------------

+
 const _savemap = Dict(
    "png" => png,
    "svg" => svg,
    "pdf" => pdf,
-    "ps" => ps,
+    "ps"  => ps,
    "eps" => eps,
    "tex" => tex,
-    "json" => json,
    "html" => html,
    "tikz" => tex,
    "txt" => txt,
-)
+  )

-const _extension_map = Dict("tikz" => "tex")
+function getExtension(fn::AbstractString)
+  pieces = split(fn, ".")
+  length(pieces) > 1 || error("Can't extract file extension: ", fn)
+  ext = pieces[end]
+  haskey(_savemap, ext) || error("Invalid file extension: ", fn)
+  ext
+end

 function addExtension(fn::AbstractString, ext::AbstractString)
-    oldfn, oldext = splitext(fn)
-    oldext = chop(oldext, head = 1, tail = 0)
-    if get(_extension_map, oldext, oldext) == ext
-        return fn
+  try
+    oldext = getExtension(fn)
+    if oldext == ext
+      return fn
    else
-        return string(fn, ".", ext)
+      return "$fn.$ext"
    end
+  catch
+    return "$fn.$ext"
+  end
 end

 """
@@ -109,28 +112,27 @@ type is inferred from the file extension. All backends support png and pdf
 file types, some also support svg, ps, eps, html and tex.
 """
 function savefig(plt::Plot, fn::AbstractString)
-    fn = abspath(expanduser(fn))
+  fn = abspath(expanduser(fn))
+  # get the extension
+  local ext
+  try
+    ext = getExtension(fn)
+  catch
+    # if we couldn't extract the extension, add the default
+    ext = defaultOutputFormat(plt)
+    fn = addExtension(fn, ext)
+  end

-    # get the extension
-    fn, ext = splitext(fn)
-    ext = chop(ext, head = 1, tail = 0)
-    if isempty(ext)
-        ext = defaultOutputFormat(plt)
-    end
-
-    # save it
-    if haskey(_savemap, ext)
-        func = _savemap[ext]
-        return func(plt, fn)
-    else
-        error("Invalid file extension: ", fn)
-    end
+  # save it
+  func = get(_savemap, ext) do
+    error("Unsupported extension $ext with filename ", fn)
+  end
+  func(plt, fn)
 end
 savefig(fn::AbstractString) = savefig(current(), fn)


 # ---------------------------------------------------------
-
 """
    gui([plot])

@@ -153,13 +155,17 @@ end
 _do_plot_show(plt, showval::Bool) = showval && gui(plt)
 function _do_plot_show(plt, showval::Symbol)
    showval == :gui && gui(plt)
-    showval in (:inline, :ijulia) && inline(plt)
+    showval in (:inline,:ijulia) && inline(plt)
 end

 # ---------------------------------------------------------

-const _best_html_output_type =
-    KW(:pyplot => :png, :unicodeplots => :txt, :plotlyjs => :html, :plotly => :html)
+const _best_html_output_type = KW(
+    :pyplot => :png,
+    :unicodeplots => :txt,
+    :plotlyjs => :html,
+    :plotly => :html
+)

 # a backup for html... passes to svg or png depending on the html_output_format arg
 function _show(io::IO, ::MIME"text/html", plt::Plot)
@@ -169,12 +175,7 @@ function _show(io::IO, ::MIME"text/html", plt::Plot)
    end
    if output_type == :png
        # @info("writing png to html output")
-        print(
-            io,
-            "<img src=\"data:image/png;base64,",
-            base64encode(show, MIME("image/png"), plt),
-            "\" />",
-        )
+        print(io, "<img src=\"data:image/png;base64,", base64encode(show, MIME("image/png"), plt), "\" />")
    elseif output_type == :svg
        # @info("writing svg to html output")
        show(io, MIME("image/svg+xml"), plt)
@@ -186,7 +187,7 @@ function _show(io::IO, ::MIME"text/html", plt::Plot)
 end

 # delegate showable to _show instead
-function Base.showable(m::M, plt::P) where {M <: MIME, P <: Plot}
+function Base.showable(m::M, plt::P) where {M<:MIME, P<:Plot}
    return hasmethod(_show, Tuple{IO, M, P})
 end

@@ -195,31 +196,21 @@ function _display(plt::Plot)
 end

 # for writing to io streams... first prepare, then callback
-for mime in (
-    "text/plain",
-    "text/html",
-    "image/png",
-    "image/eps",
-    "image/svg+xml",
-    "application/eps",
-    "application/pdf",
-    "application/postscript",
-    "application/x-tex",
-    "application/vnd.plotly.v1+json",
-)
+for mime in ("text/plain", "text/html", "image/png", "image/eps", "image/svg+xml",
+             "application/eps", "application/pdf", "application/postscript",
+             "application/x-tex", "application/vnd.plotly.v1+json")
    @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot)
        if haskey(io, :juno_plotsize)
-            showjuno(io, m, plt)
+          showjuno(io, m, plt)
        else
-            prepare_output(plt)
-            _show(io, m, plt)
+          prepare_output(plt)
+          _show(io, m, plt)
        end
        return nothing
    end
 end

-Base.show(io::IO, m::MIME"application/prs.juno.plotpane+html", plt::Plot) =
-    showjuno(io, MIME("text/html"), plt)
+Base.show(io::IO, m::MIME"application/prs.juno.plotpane+html", plt::Plot) = showjuno(io, MIME("text/html"), plt)

 # default text/plain for all backends
 _show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)
@@ -258,25 +249,25 @@ function showjuno(io::IO, m, plt)

    scale = minimum(jsize[i] / sz[i] for i in 1:2)
    plt[:size] = [s * scale for s in sz]
-    plt[:dpi] = jratio * Plots.DPI
+    plt[:dpi] = jratio*Plots.DPI
    plt[:thickness_scaling] *= scale

    prepare_output(plt)
    try
-        _showjuno(io, m, plt)
+      _showjuno(io, m, plt)
    finally
-        plt[:size] = sz
-        plt[:dpi] = dpi
-        plt[:thickness_scaling] = thickness_scaling
+      plt[:size] = sz
+      plt[:dpi] = dpi
+      plt[:thickness_scaling] = thickness_scaling
    end
 end

 function _showjuno(io::IO, m::MIME"image/svg+xml", plt)
-    if Symbol(plt.attr[:html_output_format]) ≠ :svg
-        throw(MethodError(show, (typeof(m), typeof(plt))))
-    else
-        _show(io, m, plt)
-    end
+  if Symbol(plt.attr[:html_output_format]) ≠ :svg
+    throw(MethodError(show, (typeof(m), typeof(plt))))
+  else
+    _show(io, m, plt)
+  end
 end

 Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot) = false
@@ -1,74 +1,80 @@
-# RecipesPipeline API
+function finalize_subplot!(plt::Plot, st, plotattributes::AKW)
+    sp = _prepare_subplot(plt, plotattributes)
+    _prepare_annotations(sp, plotattributes)
+    _expand_subplot_extrema(sp, plotattributes, st)
+    _update_series_attributes!(plotattributes, plt, sp)
+    _add_the_series(plt, sp, plotattributes)
+end

-## Warnings
+# Override the RecipesPipeline `is_st_supported` for Plots.
+is_st_supported(::Plot, st::Symbol) = is_seriestype_supported(st)
+# ------------------------------------------------------------------
+# preprocessing

-function RecipesPipeline.warn_on_recipe_aliases!(
-    plt::Plot,
-    plotattributes,
-    recipe_type,
-    args...,
-)
-    for k in keys(plotattributes)
-        if !is_default_attribute(k)
-            dk = get(_keyAliases, k, k)
-            if k !== dk
-                @warn "Attribute alias `$k` detected in the $recipe_type recipe defined for the signature $(_signature_string(Val{recipe_type}, args...)). To ensure expected behavior it is recommended to use the default attribute `$dk`."
-            end
-            plotattributes[dk] = RecipesPipeline.pop_kw!(plotattributes, k)
+function series_idx(kw_list::AVec{KW}, kw::AKW)
+    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
+end
+
+function _expand_seriestype_array(plotattributes::AKW, args)
+    sts = get(plotattributes, :seriestype, :path)
+    if typeof(sts) <: AbstractArray
+        reset_kw!(plotattributes, :seriestype)
+        rd = Vector{RecipeData}(undef, size(sts, 1))
+        for r in axes(sts, 1)
+            dc = copy(plotattributes)
+            dc[:seriestype] = sts[r:r,:]
+            rd[r] = RecipeData(dc, args)
        end
+        rd
+    else
+        RecipeData[RecipeData(copy(plotattributes), args)]
    end
 end
-function RecipesPipeline.warn_on_recipe_aliases!(
-    plt::Plot,
-    v::AbstractVector,
-    recipe_type,
-    args...,
-)
-    foreach(x -> RecipesPipeline.warn_on_recipe_aliases!(plt, x, recipe_type, args...), v)
-end
-function RecipesPipeline.warn_on_recipe_aliases!(
-    plt::Plot,
-    rd::RecipeData,
-    recipe_type,
-    args...,
-)
-    RecipesPipeline.warn_on_recipe_aliases!(plt, rd.plotattributes, recipe_type, args...)
+
+function _preprocess_args(plotattributes::AKW, args, still_to_process::Vector{RecipeData})
+    # the grouping mechanism is a recipe on a GroupBy object
+    # we simply add the GroupBy object to the front of the args list to allow
+    # the recipe to be applied
+    if haskey(plotattributes, :group)
+        args = (extractGroupArgs(plotattributes[:group], args...), args...)
+    end
+
+    # if we were passed a vector/matrix of seriestypes and there's more than one row,
+    # we want to duplicate the inputs, once for each seriestype row.
+    if !isempty(args)
+        append!(still_to_process, _expand_seriestype_array(plotattributes, args))
+    end
+
+    # remove subplot and axis args from plotattributes... they will be passed through in the kw_list
+    if !isempty(args)
+        for (k,v) in plotattributes
+            for defdict in (_subplot_defaults,
+                            _axis_defaults,
+                            _axis_defaults_byletter[:x],
+                            _axis_defaults_byletter[:y],
+                            _axis_defaults_byletter[:z])
+                if haskey(defdict, k)
+                    reset_kw!(plotattributes, k)
+                end
+            end
+        end
+    end
+
+    args
 end

-function _signature_string(::Type{Val{:user}}, args...)
-    return string("(::", join(string.(typeof.(args)), ", ::"), ")")
-end
-_signature_string(::Type{Val{:type}}, T) = "(::Type{$T}, ::$T)"
-_signature_string(::Type{Val{:plot}}, st) = "(::Type{Val{:$st}}, ::AbstractPlot)"
-_signature_string(::Type{Val{:series}}, st) = "(::Type{Val{:$st}}, x, y, z)"
+# ------------------------------------------------------------------
+# user recipes


-## Grouping
-
-RecipesPipeline.splittable_attribute(plt::Plot, key, val::SeriesAnnotations, len) =
-    RecipesPipeline.splittable_attribute(plt, key, val.strs, len)
-
-function RecipesPipeline.split_attribute(plt::Plot, key, val::SeriesAnnotations, indices)
-    split_strs = _RecipesPipeline.split_attribute(key, val.strs, indices)
-    return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
-end
-
-
-## Preprocessing attributes
-
-RecipesPipeline.preprocess_attributes!(plt::Plot, plotattributes) =
-    RecipesPipeline.preprocess_attributes!(plotattributes) # in src/args.jl
-
-RecipesPipeline.is_axis_attribute(plt::Plot, attr) = is_axis_attr_noletter(attr) # in src/args.jl
-
-RecipesPipeline.is_subplot_attribute(plt::Plot, attr) = is_subplot_attr(attr) # in src/args.jl
-
-
-## User recipes
-
-function RecipesPipeline.process_userrecipe!(plt::Plot, kw_list, kw)
+function _process_userrecipe(plt::Plot, kw_list::Vector{KW}, recipedata::RecipeData)
+    # when the arg tuple is empty, that means there's nothing left to recursively
+    # process... finish up and add to the kw_list
+    kw = recipedata.plotattributes
+    preprocessArgs!(kw)
    _preprocess_userrecipe(kw)
-    warn_on_unsupported_scales(plt.backend, kw)
+    warnOnUnsupported_scales(plt.backend, kw)
+
    # add the plot index
    plt.n += 1
    kw[:series_plotindex] = plt.n
@@ -82,17 +88,18 @@ end
 function _preprocess_userrecipe(kw::AKW)
    _add_markershape(kw)

+    # if there was a grouping, filter the data here
+    _filter_input_data!(kw)
+
    # map marker_z if it's a Function
    if isa(get(kw, :marker_z, nothing), Function)
        # TODO: should this take y and/or z as arguments?
-        kw[:marker_z] = isa(kw[:z], Nothing) ? map(kw[:marker_z], kw[:x], kw[:y]) :
-            map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
+        kw[:marker_z] = isa(kw[:z], Nothing) ? map(kw[:marker_z], kw[:x], kw[:y]) : map(kw[:marker_z], kw[:x], kw[:y], kw[:z])
    end

    # map line_z if it's a Function
    if isa(get(kw, :line_z, nothing), Function)
-        kw[:line_z] = isa(kw[:z], Nothing) ? map(kw[:line_z], kw[:x], kw[:y]) :
-            map(kw[:line_z], kw[:x], kw[:y], kw[:z])
+        kw[:line_z] = isa(kw[:z], Nothing) ? map(kw[:line_z], kw[:x], kw[:y]) : map(kw[:line_z], kw[:x], kw[:y], kw[:z])
    end

    # convert a ribbon into a fillrange
@@ -105,7 +112,7 @@ end
 function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
    # handle error bars by creating new recipedata data... these will have
    # the same recipedata index as the recipedata they are copied from
-    for esym in (:xerror, :yerror, :zerror)
+    for esym in (:xerror, :yerror)
        if get(kw, esym, nothing) !== nothing
            # we make a copy of the KW and apply an errorbar recipe
            errkw = copy(kw)
@@ -124,43 +131,25 @@ function _add_smooth_kw(kw_list::Vector{KW}, kw::AKW)
        β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
        sx = [ignorenan_minimum(x), ignorenan_maximum(x)]
        sy = β .* sx .+ α
-        push!(
-            kw_list,
-            merge(
-                copy(kw),
-                KW(
-                    :seriestype => :path,
-                    :x => sx,
-                    :y => sy,
-                    :fillrange => nothing,
-                    :label => "",
-                    :primary => false,
-                ),
-            ),
-        )
+        push!(kw_list, merge(copy(kw), KW(
+            :seriestype => :path,
+            :x => sx,
+            :y => sy,
+            :fillrange => nothing,
+            :label => "",
+            :primary => false,
+        )))
    end
 end

+# ------------------------------------------------------------------

-RecipesPipeline.get_axis_limits(plt::Plot, f, letter) = axis_limits(plt[1], letter)
+# ------------------------------------------------------------------
+# setup plot and subplot

-
-## Plot recipes
-
-RecipesPipeline.type_alias(plt::Plot) = get(_typeAliases, st, st)
-
-
-## Plot setup
-
-function RecipesPipeline.plot_setup!(plt::Plot, plotattributes, kw_list)
-    _plot_setup(plt, plotattributes, kw_list)
-    _subplot_setup(plt, plotattributes, kw_list)
-end
-
-# TODO: Should some of this logic be moved to RecipesPipeline?
 function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    # merge in anything meant for the Plot
-    for kw in kw_list, (k, v) in kw
+    for kw in kw_list, (k,v) in kw
        haskey(_plot_defaults, k) && (plotattributes[k] = pop!(kw, k))
    end

@@ -171,7 +160,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})

        # create the layout and subplots from the inputs
        plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
-        for (idx, sp) in enumerate(plt.subplots)
+        for (idx,sp) in enumerate(plt.subplots)
            sp.plt = plt
            sp.attr[:subplot_index] = idx
        end
@@ -196,7 +185,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
            else
                parent = plt.layout
            end
-            sp = Subplot(backend(), parent = parent)
+            sp = Subplot(backend(), parent=parent)
            sp.plt = plt
            push!(plt.subplots, sp)
            push!(plt.inset_subplots, sp)
@@ -212,34 +201,28 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    # Subplot/Axis attributes set by a user/series recipe apply only to the
    # Subplot object which they belong to.
    # TODO: allow matrices to still apply to all subplots
-    sp_attrs = Dict{Subplot, Any}()
+    sp_attrs = Dict{Subplot,Any}()
    for kw in kw_list
        # get the Subplot object to which the series belongs.
        sps = get(kw, :subplot, :auto)
-        sp = get_subplot(
-            plt,
-            _cycle(
-                sps == :auto ? plt.subplots : plt.subplots[sps],
-                series_idx(kw_list, kw),
-            ),
-        )
+        sp = get_subplot(plt, _cycle(sps == :auto ? plt.subplots : plt.subplots[sps], series_idx(kw_list,kw)))
        kw[:subplot] = sp

        # extract subplot/axis attributes from kw and add to sp_attr
        attr = KW()
-        for (k, v) in collect(kw)
+        for (k,v) in collect(kw)
            if is_subplot_attr(k) || is_axis_attr(k)
                attr[k] = pop!(kw, k)
            end
            if is_axis_attr_noletter(k)
                v = pop!(kw, k)
-                for letter in (:x, :y, :z)
-                    attr[Symbol(letter, k)] = v
+                for letter in (:x,:y,:z)
+                    attr[Symbol(letter,k)] = v
                end
            end
-            for k in (:scale,), letter in (:x, :y, :z)
+            for k in (:scale,), letter in (:x,:y,:z)
                # Series recipes may need access to this information
-                lk = Symbol(letter, k)
+                lk = Symbol(letter,k)
                if haskey(attr, lk)
                    kw[lk] = attr[lk]
                end
@@ -249,7 +232,7 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    end

    # override subplot/axis args.  `sp_attrs` take precendence
-    for (idx, sp) in enumerate(plt.subplots)
+    for (idx,sp) in enumerate(plt.subplots)
        attr = if !haskey(plotattributes, :subplot) || plotattributes[:subplot] == idx
            merge(plotattributes, get(sp_attrs, sp, KW()))
        else
@@ -262,34 +245,9 @@ function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    link_axes!(plt.layout, plt[:link])
 end

-function series_idx(kw_list::AVec{KW}, kw::AKW)
-    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
-end
-
-
-## Series recipes
-
-function RecipesPipeline.slice_series_attributes!(plt::Plot, kw_list, kw)
-    sp::Subplot = kw[:subplot]
-    # in series attributes given as vector with one element per series,
-    # select the value for current series
-    _slice_series_args!(kw, plt, sp, series_idx(kw_list, kw))
-end
-
-RecipesPipeline.series_defaults(plt::Plot) = _series_defaults # in args.jl
-
-RecipesPipeline.is_seriestype_supported(plt::Plot, st) = is_seriestype_supported(st)
-
-function RecipesPipeline.add_series!(plt::Plot, plotattributes)
-    sp = _prepare_subplot(plt, plotattributes)
-    _expand_subplot_extrema(sp, plotattributes, plotattributes[:seriestype])
-    _update_series_attributes!(plotattributes, plt, sp)
-    _add_the_series(plt, sp, plotattributes)
-end
-
 # getting ready to add the series... last update to subplot from anything
 # that might have been added during series recipes
-function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
+function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where T
    st::Symbol = plotattributes[:seriestype]
    sp::Subplot{T} = plotattributes[:subplot]
    sp_idx = get_subplot_index(plt, sp)
@@ -298,7 +256,7 @@ function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
    st = _override_seriestype_check(plotattributes, st)

    # change to a 3d projection for this subplot?
-    if RecipesPipeline.needs_3d_axes(st)
+    if is3d(st)
        sp.attr[:projection] = "3d"
    end

@@ -310,12 +268,14 @@ function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
    sp
 end

+# ------------------------------------------------------------------
+# series types
+
 function _override_seriestype_check(plotattributes::AKW, st::Symbol)
    # do we want to override the series type?
-    if !RecipesPipeline.is3d(st) && !(st in (:contour, :contour3d))
+    if !is3d(st) && !(st in (:contour,:contour3d))
        z = plotattributes[:z]
-        if !isa(z, Nothing) &&
-           (size(plotattributes[:x]) == size(plotattributes[:y]) == size(z))
+        if !isa(z, Nothing) && (size(plotattributes[:x]) == size(plotattributes[:y]) == size(z))
            st = (st == :scatter ? :scatter3d : :path3d)
            plotattributes[:seriestype] = st
        end
@@ -323,11 +283,27 @@ function _override_seriestype_check(plotattributes::AKW, st::Symbol)
    st
 end

+function _prepare_annotations(sp::Subplot, plotattributes::AKW)
+    # strip out series annotations (those which are based on series x/y coords)
+    # and add them to the subplot attr
+    sp_anns = annotations(sp[:annotations])
+    # series_anns = annotations(pop!(plotattributes, :series_annotations, []))
+    # if isa(series_anns, SeriesAnnotations)
+    #     series_anns.x = plotattributes[:x]
+    #     series_anns.y = plotattributes[:y]
+    # elseif length(series_anns) > 0
+    #     x, y = plotattributes[:x], plotattributes[:y]
+    #     nx, ny, na = map(length, (x,y,series_anns))
+    #     n = max(nx, ny, na)
+    #     series_anns = [(x[mod1(i,nx)], y[mod1(i,ny)], text(series_anns[mod1(i,na)])) for i=1:n]
+    # end
+    # sp.attr[:annotations] = vcat(sp_anns, series_anns)
+end
+
 function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
    # adjust extrema and discrete info
    if st == :image
-        xmin, xmax = ignorenan_extrema(plotattributes[:x])
-        ymin, ymax = ignorenan_extrema(plotattributes[:y])
+        xmin, xmax = ignorenan_extrema(plotattributes[:x]); ymin, ymax = ignorenan_extrema(plotattributes[:y])
        expand_extrema!(sp[:xaxis], (xmin, xmax))
        expand_extrema!(sp[:yaxis], (ymin, ymax))
    elseif !(st in (:pie, :histogram, :bins2d, :histogram2d))
@@ -341,8 +317,8 @@ function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
 end

 function _add_the_series(plt, sp, plotattributes)
-    warn_on_unsupported_args(plt.backend, plotattributes)
-    warn_on_unsupported(plt.backend, plotattributes)
+    warnOnUnsupported_args(plt.backend, plotattributes)
+    warnOnUnsupported(plt.backend, plotattributes)
    series = Series(plotattributes)
    push!(plt.series_list, series)
    push!(sp.series_list, series)
@@ -49,19 +49,19 @@ as a String to look up its docstring; e.g. `plotattr("seriestype")`.
 function plot(args...; kw...)
    # this creates a new plot with args/kw and sets it to be the current plot
    plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)

    # create an empty Plot then process
    plt = Plot()
    # plt.user_attr = plotattributes
-    _plot!(plt, plotattributes, args)
+    recipe_pipeline!(plt, plotattributes, args, type_aliases=_typeAliases)
 end

 # build a new plot from existing plots
 # note: we split into plt1 and plts_tail so we can dispatch correctly
 function plot(plt1::Plot, plts_tail::Plot...; kw...)
    plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)

    # build our plot vector from the args
    n = length(plts_tail) + 1
@@ -153,9 +153,9 @@ end
 # this adds to a specific plot... most plot commands will flow through here
 function plot!(plt::Plot, args...; kw...)
    plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
    # merge!(plt.user_attr, plotattributes)
-    _plot!(plt, plotattributes, args)
+    recipe_pipeline!(plt, plotattributes, args, type_aliases=_typeAliases)
 end

 # -------------------------------------------------------------------------------
@@ -163,13 +163,51 @@ end
 # this is the core plotting function.  recursively apply recipes to build
 # a list of series KW dicts.
 # note: at entry, we only have those preprocessed args which were passed in... no default values yet
-function _plot!(plt::Plot, plotattributes, args)
-    RecipesPipeline.recipe_pipeline!(plt, plotattributes, args)
-    current(plt)
-    _do_plot_show(plt, plt[:show])
-    return plt
+
+## here we implement the recipe interface
+function _recipe_init!(plt::Plot, plotattributes::AKW, args::Tuple)
+    plotattributes[:plot_object] = plt
+
+    if !isempty(args) && !isdefined(Main, :StatsPlots) &&
+            first(split(string(typeof(args[1])), ".")) == "DataFrames"
+        @warn("You're trying to plot a DataFrame, but this functionality is provided by StatsPlots")
+    end
 end

+function _recipe_after_plot!(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+    # --------------------------------
+    # Plot/Subplot/Layout setup
+    # --------------------------------
+    _plot_setup(plt, plotattributes, kw_list)
+    _subplot_setup(plt, plotattributes, kw_list)
+end
+
+function _recipe_after_user!(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+    # don't allow something else to handle it
+    plotattributes[:smooth] = false
+end
+
+function _recipe_before_series!(plt::Plot, kw, kw_list)
+    sp::Subplot = kw[:subplot]
+
+    # in series attributes given as vector with one element per series,
+    # select the value for current series
+    _slice_series_args!(kw, plt, sp, series_idx(kw_list,kw))
+
+    series_attr = Attr(kw, _series_defaults)
+end
+
+function _recipe_finish!(plt::Plot, plotattributes::AKW, args::Tuple)
+    current(plt)
+
+    # do we want to force display?
+    # if plt[:show]
+    #     gui(plt)
+    # end
+    _do_plot_show(plt, plt[:show])
+
+    plt
+end

 # we're getting ready to display/output.  prep for layout calcs, then update
 # the plot object after
@@ -212,3 +250,5 @@ function plot!(sp::Subplot, args...; kw...)
    plt = sp.plt
    plot!(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
 end
+
+# --------------------------------------------------------------------
@@ -457,8 +457,6 @@ end
    ()
 end
@deps plots_heatmap shape
-is_3d(::Type{Val{:plots_heatmap}}) = true
-RecipesPipeline.is_surface(::Type{Val{:plots_heatmap}}) = true

 # ---------------------------------------------------------------------------
 # Histograms
@@ -1014,62 +1012,49 @@ function error_zipit(ebar)
    end
 end

-error_tuple(x) = x, x
-error_tuple(x::Tuple) = x
-
-function error_coords(errorbar, errordata, otherdata...)
-    ed = Vector{float_extended_type(errordata)}(undef, 0)
-    od = [Vector{float_extended_type(odi)}(undef, 0) for odi in otherdata]
-    for (i, edi) in enumerate(errordata)
-        for (j, odj) in enumerate(otherdata)
-            odi = _cycle(odj, i)
-            nanappend!(od[j], [odi, odi])
+function error_coords(xorig, yorig, ebar)
+    # init empty x/y, and zip errors if passed Tuple{Vector,Vector}
+    x, y = Array{float_extended_type(xorig)}(undef, 0), Array{Float64}(undef, 0)
+    # for each point, create a line segment from the bottom to the top of the errorbar
+    for i = 1:max(length(xorig), length(yorig))
+        xi = _cycle(xorig, i)
+        yi = _cycle(yorig, i)
+        ebi = _cycle(ebar, i)
+        nanappend!(x, [xi, xi])
+        e1, e2 = if istuple(ebi)
+            first(ebi), last(ebi)
+        elseif isscalar(ebi)
+            ebi, ebi
+        else
+            error("unexpected ebi type $(typeof(ebi)) for errorbar: $ebi")
        end
-        e1, e2 = error_tuple(_cycle(errorbar, i))
-        nanappend!(ed, [edi - e1, edi + e2])
+        nanappend!(y, [yi - e1, yi + e2])
    end
-    return (ed, od...)
+    x, y
 end

 # we will create a series of path segments, where each point represents one
 # side of an errorbar
-
-@recipe function f(::Type{Val{:xerror}}, x, y, z)
-    error_style!(plotattributes)
-    markershape := :vline
-    xerr = error_zipit(plotattributes[:xerror])
-    if z === nothing
-        plotattributes[:x], plotattributes[:y] = error_coords(xerr, x, y)
-    else
-        plotattributes[:x], plotattributes[:y], plotattributes[:z] =
-            error_coords(xerr, x, y, z)
-    end
-    ()
-end
-@deps xerror path
-
@recipe function f(::Type{Val{:yerror}}, x, y, z)
    error_style!(plotattributes)
    markershape := :hline
-    yerr = error_zipit(plotattributes[:yerror])
-    if z === nothing
-        plotattributes[:y], plotattributes[:x] = error_coords(yerr, y, x)
-    else
-        plotattributes[:y], plotattributes[:x], plotattributes[:z] =
-            error_coords(yerr, y, x, z)
-    end
+    plotattributes[:x], plotattributes[:y] = error_coords(
+        plotattributes[:x],
+        plotattributes[:y],
+        error_zipit(plotattributes[:yerror]),
+    )
    ()
 end
@deps yerror path

-@recipe function f(::Type{Val{:zerror}}, x, y, z)
+@recipe function f(::Type{Val{:xerror}}, x, y, z)
    error_style!(plotattributes)
-    markershape := :hline
-    if z !== nothing
-        zerr = error_zipit(plotattributes[:zerror])
-        plotattributes[:z], plotattributes[:x], plotattributes[:y] =
-            error_coords(zerr, z, x, y)
-    end
+    markershape := :vline
+    plotattributes[:y], plotattributes[:x] = error_coords(
+        plotattributes[:y],
+        plotattributes[:x],
+        error_zipit(plotattributes[:xerror]),
+    )
    ()
 end
@deps xerror path
@@ -1164,7 +1149,7 @@ function quiver_using_hack(plotattributes::AKW)
        )
    end

-    plotattributes[:x], plotattributes[:y] = RecipesPipeline.unzip(pts[2:end])
+    plotattributes[:x], plotattributes[:y] = Plots.unzip(pts[2:end])
    # KW[plotattributes]
 end

@@ -1180,118 +1165,6 @@ end
@deps quiver shape path


-# --------------------------------------------------------------------
-# 1 argument
-# --------------------------------------------------------------------
-
-# images - grays
-function clamp_greys!(mat::AMat{<:Gray})
-    for i in eachindex(mat)
-        mat[i].val < 0 && (mat[i] = Gray(0))
-        mat[i].val > 1 && (mat[i] = Gray(1))
-    end
-    mat
-end
-
-@recipe function f(mat::AMat{<:Gray})
-    n, m = axes(mat)
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, m, n, Surface(clamp_greys!(mat))
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        fillcolor --> ColorGradient([:black, :white])
-        SliceIt, m, n, Surface(clamp!(convert(Matrix{Float64}, mat), 0.0, 1.0))
-    end
-end
-
-# images - colors
-@recipe function f(mat::AMat{T}) where {T <: Colorant}
-    n, m = axes(mat)
-
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, m, n, Surface(mat)
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        aspect_ratio --> :equal
-        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
-        SliceIt, m, n, Surface(z)
-    end
-end
-
-# plotting arbitrary shapes/polygons
-
-@recipe function f(shape::Shape)
-    seriestype --> :shape
-    coords(shape)
-end
-
-@recipe function f(shapes::AVec{Shape})
-    seriestype --> :shape
-    coords(shapes)
-end
-
-@recipe function f(shapes::AMat{Shape})
-    seriestype --> :shape
-    for j in axes(shapes, 2)
-        @series coords(vec(shapes[:, j]))
-    end
-end
-
-
-# --------------------------------------------------------------------
-# 3 arguments
-# --------------------------------------------------------------------
-
-# images - grays
-@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where {T <: Gray}
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, x, y, Surface(mat)
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        fillcolor --> ColorGradient([:black, :white])
-        SliceIt, x, y, Surface(convert(Matrix{Float64}, mat))
-    end
-end
-
-# images - colors
-@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where {T <: Colorant}
-    if is_seriestype_supported(:image)
-        seriestype := :image
-        yflip --> true
-        SliceIt, x, y, Surface(mat)
-    else
-        seriestype := :heatmap
-        yflip --> true
-        cbar --> false
-        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
-        SliceIt, x, y, Surface(z)
-    end
-end
-
-# --------------------------------------------------------------------
-# Lists of tuples and GeometryTypes.Points
-# --------------------------------------------------------------------
-@recipe f(v::AVec{<:GeometryTypes.Point}) = RecipesPipeline.unzip(v)
-@recipe f(p::GeometryTypes.Point) = [p]
-
-# Special case for 4-tuples in :ohlc series
-@recipe f(xyuv::AVec{<:Tuple{R1, R2, R3, R4}}) where {R1, R2, R3, R4} =
-    get(plotattributes, :seriestype, :path) == :ohlc ? OHLC[OHLC(t...) for t in xyuv] :
-    RecipesPipeline.unzip(xyuv)
-
-
 # -------------------------------------------------

 # TODO: move OHLC to PlotRecipes finance.jl
@@ -1388,8 +1261,8 @@ end
    yflip := true
    aspect_ratio := 1
    rs, cs, zs = findnz(z.surf)
-    xlims := ignorenan_extrema(cs)
-    ylims := ignorenan_extrema(rs)
+    xlim := ignorenan_extrema(cs)
+    ylim := ignorenan_extrema(rs)
    if plotattributes[:markershape] == :none
        markershape := :circle
    end
@@ -1415,6 +1288,26 @@ abline!(plt::Plot, a, b; kw...) =

 abline!(args...; kw...) = abline!(current(), args...; kw...)

+
+# -------------------------------------------------
+# Dates & Times
+
+dateformatter(dt) = string(Date(Dates.UTD(dt)))
+datetimeformatter(dt) = string(DateTime(Dates.UTM(dt)))
+timeformatter(t) = string(Dates.Time(Dates.Nanosecond(t)))
+
+@recipe f(::Type{Date}, dt::Date) = (dt -> Dates.value(dt), dateformatter)
+@recipe f(::Type{DateTime}, dt::DateTime) =
+    (dt -> Dates.value(dt), datetimeformatter)
+@recipe f(::Type{Dates.Time}, t::Dates.Time) = (t -> Dates.value(t), timeformatter)
+@recipe f(::Type{P}, t::P) where {P<:Dates.Period} =
+    (t -> Dates.value(t), t -> string(P(t)))
+
+# -------------------------------------------------
+# Characters
+
+@recipe f(::Type{<:AbstractChar}, ::AbstractChar) = (string, string)
+
 # -------------------------------------------------
 # Complex Numbers

@@ -0,0 +1,520 @@
+
+# --------------------------------------------------------------------
+
+# TODO: can we avoid the copy here?  one error that crops up is that mapping functions over the same array
+#       result in that array being shared.  push!, etc will add too many items to that array
+
+compute_x(x::Nothing, y::Nothing, z)      = axes(z,1)
+compute_x(x::Nothing, y, z)            = axes(y,1)
+compute_x(x::Function, y, z)        = map(x, y)
+compute_x(x, y, z)                  = copy(x)
+
+# compute_y(x::Void, y::Function, z)  = error()
+compute_y(x::Nothing, y::Nothing, z)      = axes(z,2)
+compute_y(x, y::Function, z)        = map(y, x)
+compute_y(x, y, z)                  = copy(y)
+
+compute_z(x, y, z::Function)        = map(z, x, y)
+compute_z(x, y, z::AbstractMatrix)  = Surface(z)
+compute_z(x, y, z::Nothing)            = nothing
+compute_z(x, y, z)                  = copy(z)
+
+nobigs(v::AVec{BigFloat}) = map(Float64, v)
+nobigs(v::AVec{BigInt}) = map(Int64, v)
+nobigs(v) = v
+
+@noinline function compute_xyz(x, y, z)
+    x = compute_x(x,y,z)
+    y = compute_y(x,y,z)
+    z = compute_z(x,y,z)
+    nobigs(x), nobigs(y), nobigs(z)
+end
+
+# not allowed
+compute_xyz(x::Nothing, y::FuncOrFuncs{F}, z) where {F<:Function}       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz(x::Nothing, y::Nothing, z::FuncOrFuncs{F}) where {F<:Function} = error("If you want to plot the function `$z`, you need to define x and y values!")
+compute_xyz(x::Nothing, y::Nothing, z::Nothing)        = error("x/y/z are all nothing!")
+
+# --------------------------------------------------------------------
+
+
+# we are going to build recipes to do the processing and splitting of the args
+
+
+_apply_type_recipe(plotattributes, v) = RecipesBase.apply_recipe(plotattributes, typeof(v), v)[1].args[1]
+
+# Handle type recipes when the recipe is defined on the elements.
+# This sort of recipe should return a pair of functions... one to convert to number,
+# and one to format tick values.
+function _apply_type_recipe(plotattributes, v::AbstractArray)
+    isempty(skipmissing(v)) && return Float64[]
+    x = first(skipmissing(v))
+    args = RecipesBase.apply_recipe(plotattributes, typeof(x), x)[1].args
+    if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
+        numfunc, formatter = args
+        Formatted(map(numfunc, v), formatter)
+    else
+        v
+    end
+end
+
+# # special handling for Surface... need to properly unwrap and re-wrap
+# function _apply_type_recipe(plotattributes, v::Surface)
+#     T = eltype(v.surf)
+#     @show T
+#     if T <: Integer || T <: AbstractFloat
+#         v
+#     else
+#         ret = _apply_type_recipe(plotattributes, v.surf)
+#         if typeof(ret) <: Formatted
+#             Formatted(Surface(ret.data), ret.formatter)
+#         else
+#             v
+#         end
+#     end
+# end
+
+# don't do anything for ints or floats
+_apply_type_recipe(plotattributes, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat}} = v
+
+# handle "type recipes" by converting inputs, and then either re-calling or slicing
+@recipe function f(x, y, z)
+    did_replace = false
+    newx = _apply_type_recipe(plotattributes, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(plotattributes, y)
+    y === newy || (did_replace = true)
+    newz = _apply_type_recipe(plotattributes, z)
+    z === newz || (did_replace = true)
+    if did_replace
+        newx, newy, newz
+    else
+        SliceIt, x, y, z
+    end
+end
+@recipe function f(x, y)
+    did_replace = false
+    newx = _apply_type_recipe(plotattributes, x)
+    x === newx || (did_replace = true)
+    newy = _apply_type_recipe(plotattributes, y)
+    y === newy || (did_replace = true)
+    if did_replace
+        newx, newy
+    else
+        SliceIt, x, y, nothing
+    end
+end
+@recipe function f(y)
+    newy = _apply_type_recipe(plotattributes, y)
+    if y !== newy
+        newy
+    else
+        SliceIt, nothing, y, nothing
+    end
+end
+
+# if there's more than 3 inputs, it can't be passed directly to SliceIt
+# so we'll apply_type_recipe to all of them
+@recipe function f(v1, v2, v3, v4, vrest...)
+    did_replace = false
+    newargs = map(v -> begin
+        newv = _apply_type_recipe(plotattributes, v)
+        if newv !== v
+            did_replace = true
+        end
+        newv
+    end, (v1, v2, v3, v4, vrest...))
+    if !did_replace
+        error("Couldn't process recipe args: $(map(typeof, (v1, v2, v3, v4, vrest...)))")
+    end
+    newargs
+end
+
+
+# # --------------------------------------------------------------------
+# # 1 argument
+# # --------------------------------------------------------------------
+
+# helper function to ensure relevant attributes are wrapped by Surface
+function wrap_surfaces(plotattributes::AKW)
+    if haskey(plotattributes, :fill_z)
+        v = plotattributes[:fill_z]
+        if !isa(v, Surface)
+            plotattributes[:fill_z] = Surface(v)
+        end
+    end
+end
+
+@recipe f(n::Integer) = is3d(get(plotattributes,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)
+
+
+# return a surface if this is a 3d plot, otherwise let it be sliced up
+@recipe function f(mat::AMat{T}) where T<:Union{Integer,AbstractFloat,Missing}
+    if all3D(plotattributes)
+        n,m = axes(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, m, n, Surface(mat)
+    else
+        SliceIt, nothing, mat, nothing
+    end
+end
+
+# if a matrix is wrapped by Formatted, do similar logic, but wrap data with Surface
+@recipe function f(fmt::Formatted{T}) where T<:AbstractMatrix
+    if all3D(plotattributes)
+        mat = fmt.data
+        n,m = axes(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, m, n, Formatted(Surface(mat), fmt.formatter)
+    else
+        SliceIt, nothing, fmt, nothing
+    end
+end
+
+# assume this is a Volume, so construct one
+@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Union{Number,Missing}
+    seriestype := :volume
+    SliceIt, nothing, Volume(vol, args...), nothing
+end
+
+
+# # images - grays
+function clamp_greys!(mat::AMat{T}) where T<:Gray
+    for i in eachindex(mat)
+        mat[i].val < 0 && (mat[i] = Gray(0))
+        mat[i].val > 1 && (mat[i] = Gray(1))
+    end
+    mat
+end
+
+@recipe function f(mat::AMat{T}) where T<:Gray
+    n, m = axes(mat)
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, m, n, Surface(clamp_greys!(mat))
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, m, n, Surface(clamp!(convert(Matrix{Float64}, mat), 0., 1.))
+    end
+end
+
+# # images - colors
+
+@recipe function f(mat::AMat{T}) where T<:Colorant
+	n, m = axes(mat)
+
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, m, n, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        aspect_ratio --> :equal
+        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, m, n, Surface(z)
+    end
+end
+
+#
+# # plotting arbitrary shapes/polygons
+
+@recipe function f(shape::Shape)
+    seriestype --> :shape
+    coords(shape)
+end
+
+@recipe function f(shapes::AVec{Shape})
+    seriestype --> :shape
+    coords(shapes)
+end
+
+@recipe function f(shapes::AMat{Shape})
+    seriestype --> :shape
+    for j in axes(shapes,2)
+        @series coords(vec(shapes[:,j]))
+    end
+end
+
+# Dicts: each entry is a data point (x,y)=(key,value)
+
+@recipe f(d::AbstractDict) = collect(keys(d)), collect(values(d))
+
+# function without range... use the current range of the x-axis
+
+@recipe function f(f::FuncOrFuncs{F}) where F<:Function
+    plt = plotattributes[:plot_object]
+    xmin, xmax = if haskey(plotattributes, :xlims)
+        plotattributes[:xlims]
+    else
+        try
+            axis_limits(plt[1], :x)
+        catch
+            xinv = invscalefunc(get(plotattributes, :xscale, :identity))
+            xm = tryrange(f, xinv.([-5,-1,0,0.01]))
+            xm, tryrange(f, filter(x->x>xm, xinv.([5,1,0.99, 0, -0.01])))
+        end
+    end
+
+    f, xmin, xmax
+end
+
+# try some intervals over which the function may be defined
+function tryrange(F::AbstractArray, vec)
+    rets = [tryrange(f, vec) for f in F] # get the preferred for each
+    maxind = maximum(indexin(rets, vec)) # get the last attempt that succeeded (most likely to fit all)
+    rets .= [tryrange(f, vec[maxind:maxind]) for f in F] # ensure that all functions compute there
+    rets[1]
+end
+
+function tryrange(F, vec)
+    for v in vec
+        try
+            tmp = F(v)
+            return v
+        catch
+        end
+    end
+    error("$F is not a Function, or is not defined at any of the values $vec")
+end
+#
+# # --------------------------------------------------------------------
+# # 2 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # if functions come first, just swap the order (not to be confused with parametric functions...
+# # as there would be more than one function passed in)
+
+@recipe function f(f::FuncOrFuncs{F}, x) where F<:Function
+    F2 = typeof(x)
+    @assert !(F2 <: Function || (F2 <: AbstractArray && F2.parameters[1] <: Function))  # otherwise we'd hit infinite recursion here
+    x, f
+end
+
+#
+# # --------------------------------------------------------------------
+# # 3 arguments
+# # --------------------------------------------------------------------
+#
+#
+# # 3d line or scatter
+
+@recipe function f(x::AVec, y::AVec, z::AVec)
+    # st = get(plotattributes, :seriestype, :none)
+    # if st == :scatter
+    #     plotattributes[:seriestype] = :scatter3d
+    # elseif !is3d(st)
+    #     plotattributes[:seriestype] = :path3d
+    # end
+    SliceIt, x, y, z
+end
+
+@recipe function f(x::AMat, y::AMat, z::AMat)
+    # st = get(plotattributes, :seriestype, :none)
+    # if size(x) == size(y) == size(z)
+    #     if !is3d(st)
+    #         seriestype := :path3d
+    #     end
+    # end
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, z
+end
+
+#
+# # surface-like... function
+
+@recipe function f(x::AVec, y::AVec, zf::Function)
+    # x = X <: Number ? sort(x) : x
+    # y = Y <: Number ? sort(y) : y
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
+end
+
+#
+# # surface-like... matrix grid
+
+@recipe function f(x::AVec, y::AVec, z::AMat)
+    if !like_surface(get(plotattributes, :seriestype, :none))
+        plotattributes[:seriestype] = :contour
+    end
+    wrap_surfaces(plotattributes)
+    SliceIt, x, y, Surface(z)
+end
+
+# # images - grays
+
+@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Gray
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, x, y, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, x, y, Surface(convert(Matrix{Float64}, mat))
+    end
+end
+
+# # images - colors
+
+@recipe function f(x::AVec, y::AVec, mat::AMat{T}) where T<:Colorant
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, x, y, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, x, y, Surface(z)
+    end
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Parametric functions
+# # --------------------------------------------------------------------
+
+#
+# # special handling... xmin/xmax with parametric function(s)
+@recipe function f(f::Function, xmin::Number, xmax::Number)
+    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
+    _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+end
+@recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
+    xscale, yscale = [get(plotattributes, sym, :identity) for sym=(:xscale,:yscale)]
+    xs = Array{Any}(undef, length(fs))
+    ys = Array{Any}(undef, length(fs))
+    for (i, (x, y)) in enumerate(_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs)
+        xs[i] = x
+    	ys[i] = y
+    end
+    xs, ys
+end
+@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec) where {F<:Function,G<:Function}  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
+@recipe f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) where {F<:Function,G<:Function} = fx, fy, range(umin, stop = umax, length = n)
+
+function _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+    (xf, xinv), (yf, yinv) =  ((scalefunc(s),invscalefunc(s)) for s in (xscale,yscale))
+    xs, ys = adapted_grid(yf∘f∘xinv, xf.((xmin, xmax)))
+    xinv.(xs), yinv.(ys)
+end
+
+#
+# # special handling... 3D parametric function(s)
+@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, u::AVec) where {F<:Function,G<:Function,H<:Function}
+    mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u), mapFuncOrFuncs(fz, u)
+end
+@recipe function f(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, umin::Number, umax::Number, numPoints = 200) where {F<:Function,G<:Function,H<:Function}
+    fx, fy, fz, range(umin, stop = umax, length = numPoints)
+end
+
+#
+#
+# # --------------------------------------------------------------------
+# # Lists of tuples and GeometryTypes.Points
+# # --------------------------------------------------------------------
+#
+
+@recipe f(v::AVec{<:Tuple})               = unzip(v)
+@recipe f(v::AVec{<:GeometryTypes.Point}) = unzip(v)
+@recipe f(tup::Tuple)             = [tup]
+@recipe f(p::GeometryTypes.Point) = [p]
+
+# Special case for 4-tuples in :ohlc series
+@recipe f(xyuv::AVec{<:Tuple{R1,R2,R3,R4}}) where {R1,R2,R3,R4} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
+
+#
+# # --------------------------------------------------------------------
+# # handle grouping
+# # --------------------------------------------------------------------
+
+# @recipe function f(groupby::GroupBy, args...)
+#     for (i,glab) in enumerate(groupby.groupLabels)
+#         # create a new series, with the label of the group, and an idxfilter (to be applied in slice_and_dice)
+#         # TODO: use @series instead
+#         @show i, glab, groupby.groupIds[i]
+#         di = copy(plotattributes)
+#         get!(di, :label, string(glab))
+#         get!(di, :idxfilter, groupby.groupIds[i])
+#         push!(series_list, RecipeData(di, args))
+#     end
+#     nothing
+# end
+
+splittable_kw(key, val, lengthGroup) = false
+splittable_kw(key, val::AbstractArray, lengthGroup) = !(key in (:group, :color_palette)) && length(axes(val,1)) == lengthGroup
+splittable_kw(key, val::Tuple, lengthGroup) = all(splittable_kw.(key, val, lengthGroup))
+splittable_kw(key, val::SeriesAnnotations, lengthGroup) = splittable_kw(key, val.strs, lengthGroup)
+
+split_kw(key, val::AbstractArray, indices) = val[indices, fill(Colon(), ndims(val)-1)...]
+split_kw(key, val::Tuple, indices) = Tuple(split_kw(key, v, indices) for v in val)
+function split_kw(key, val::SeriesAnnotations, indices)
+    split_strs = split_kw(key, val.strs, indices)
+    return SeriesAnnotations(split_strs, val.font, val.baseshape, val.scalefactor)
+end
+
+function groupedvec2mat(x_ind, x, y::AbstractArray, groupby, def_val = y[1])
+    y_mat = Array{promote_type(eltype(y), typeof(def_val))}(undef, length(keys(x_ind)), length(groupby.groupLabels))
+    fill!(y_mat, def_val)
+    for i in eachindex(groupby.groupLabels)
+        xi = x[groupby.groupIds[i]]
+        yi = y[groupby.groupIds[i]]
+        y_mat[getindex.(Ref(x_ind), xi), i] = yi
+    end
+    return y_mat
+end
+
+groupedvec2mat(x_ind, x, y::Tuple, groupby) = Tuple(groupedvec2mat(x_ind, x, v, groupby) for v in y)
+
+group_as_matrix(t) = false
+
+# split the group into 1 series per group, and set the label and idxfilter for each
+@recipe function f(groupby::GroupBy, args...)
+    lengthGroup = maximum(union(groupby.groupIds...))
+    if !(group_as_matrix(args[1]))
+        for (i,glab) in enumerate(groupby.groupLabels)
+            @series begin
+                label     --> string(glab)
+                idxfilter --> groupby.groupIds[i]
+                for (key,val) in plotattributes
+                    if splittable_kw(key, val, lengthGroup)
+                        :($key) := split_kw(key, val, groupby.groupIds[i])
+                    end
+                end
+                args
+            end
+        end
+    else
+        g = args[1]
+        if length(g.args) == 1
+            x = zeros(Int, lengthGroup)
+            for indexes in groupby.groupIds
+                x[indexes] = eachindex(indexes)
+            end
+            last_args = g.args
+        else
+            x = g.args[1]
+            last_args = g.args[2:end]
+        end
+        x_u = unique(sort(x))
+        x_ind = Dict(zip(x_u, eachindex(x_u)))
+        for (key,val) in plotattributes
+            if splittable_kw(key, val, lengthGroup)
+                :($key) := groupedvec2mat(x_ind, x, val, groupby)
+            end
+        end
+        label --> reshape(groupby.groupLabels, 1, :)
+        typeof(g)((x_u, (groupedvec2mat(x_ind, x, arg, groupby, NaN) for arg in last_args)...))
+    end
+end
@@ -251,7 +251,7 @@ Draw contour lines of the `Surface` z.

 # Example
 ```julia-repl
-julia> x = y = range(-20, stop = 20, length = 100)
+julia> x = y = range(-20, 20, length = 100)
 julia> contour(x, y, (x, y) -> x^2 + y^2)
 ```
 """
@@ -271,8 +271,7 @@ Draw a 3D surface plot.

 # Example
 ```julia-repl
-julia> using LinearAlgebra
-julia> x = y = range(-3, stop = 3, length = 100)
+julia> x = y = range(-3, 3, length = 100)
 julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
 ```
 """
@@ -429,8 +428,8 @@ Add annotations to an existing plot.

 # Arguments

- `anns`: An `AbstractVector` of tuples of the form `(x,y,text)`. The `text` object
-          can be a `String` or `PlotText`.
+- `anns`: An `AbstractVector` of tuples of the form (x,y,text). The text object
+          can be an String or PlotText

 # Example
 ```julia-repl
@@ -438,9 +437,8 @@ julia> plot(1:10)
 julia> annotate!([(7,3,"(7,3)"),(3,7,text("hey", 14, :left, :top, :green))])
 ```
 """
-annotate!(anns...; kw...)             = plot!(; annotation = anns, kw...)
-annotate!(anns::Tuple...; kw...)      = plot!(; annotation = collect(anns), kw...)
-annotate!(anns::AVec{<:Tuple}; kw...) = plot!(; annotation = anns, kw...)
+annotate!(anns...; kw...)                                        = plot!(; annotation = anns, kw...)
+annotate!(anns::AVec{T}; kw...) where {T<:Tuple}                 = plot!(; annotation = anns, kw...)

 "Flip the current plots' x axis"
 xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
@@ -7,7 +7,7 @@ function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
        (20mm, 5mm, 2mm, 10mm),
        defaultbox,
        defaultbox,
-        DefaultsDict(KW(), _subplot_defaults),
+        Attr(KW(), _subplot_defaults),
        nothing,
        nothing
    )
@@ -14,15 +14,25 @@ function _theme(s::Symbol, defaults::AKW; kw...)

    # Set the theme's gradient as default
    if haskey(defaults, :colorgradient)
-        PlotUtils.default_cgrad(pop!(defaults, :colorgradient))
+        PlotUtils.clibrary(:misc)
+        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
+        pop!(defaults, :colorgradient)
    else
-        PlotUtils.default_cgrad(:default)
+        PlotUtils.clibrary(:Plots)
+        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
    end

    # maybe overwrite the theme's gradient
    kw = KW(kw)
    if haskey(kw, :colorgradient)
-        PlotUtils.default_cgrad(pop!(kw, :colorgradient))
+        kwgrad = pop!(kw, :colorgradient)
+        for clib in clibraries()
+            if kwgrad in cgradients(clib)
+                PlotUtils.clibrary(clib)
+                PlotUtils.default_cgrad(default = :sequential, sequential = kwgrad)
+                break
+            end
+        end
    end

    # Set the theme's defaults
@@ -47,12 +57,12 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
    defaults = PlotThemes._themes[thm].defaults

    # get the gradient
-    gradient_colors = color_list(cgrad(get(defaults, :colorgradient, :default)))
+    gradient_colors = get(defaults, :colorgradient, cgrad(:inferno).colors)
    colorgradient = cgrad(cfunc.(RGB.(gradient_colors)))

    # get the palette
-    cp = color_list(palette(get(defaults, :palette, :default)))
-    cp = cfunc.(RGB.(cp))
+    palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
+    palette = cfunc.(RGB.(palette))

    # apply the theme
    for k in keys(defaults)
@@ -79,7 +89,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
    for j in 1:4
        @series begin
            subplot := 1
-            color_palette := cp
+            palette := palette
            seriestype := :path
            cumsum(randn(50))
        end
@@ -87,7 +97,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
        @series begin
            subplot := 2
            seriestype := :scatter
-            color_palette := cp
+            palette := palette
            marker := (:circle, :diamond, :star5, :square)[j]
            randn(10), randn(10)
        end
@@ -96,7 +106,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
    @series begin
        subplot := 3
        seriestype := :histogram
-        color_palette := cp
+        palette := palette
        randn(1000) .+ (0:2:4)'
    end

@@ -18,10 +18,64 @@ end
 wrap(obj::T) where {T} = InputWrapper{T}(obj)
 Base.isempty(wrapper::InputWrapper) = false

+
+# -----------------------------------------------------------
+
+struct Attr <: AbstractDict{Symbol,Any}
+    explicit::KW
+    defaults::KW
+end
+
+Base.getindex(attr::Attr, k) = haskey(attr.explicit,k) ?
+                                     attr.explicit[k] : attr.defaults[k]
+Base.haskey(attr::Attr, k) = haskey(attr.explicit,k) || haskey(attr.defaults,k)
+Base.get(attr::Attr, k, default) = haskey(attr, k) ? attr[k] : default
+function Base.get!(attr::Attr, k, default)
+    v = if haskey(attr, k)
+        attr[k]
+    else
+        attr.defaults[k] = default
+    end
+    return v
+end
+function Base.delete!(attr::Attr, k)
+    haskey(attr.explicit, k) && delete!(attr.explicit, k)
+    haskey(attr.defaults, k) && delete!(attr.defaults, k)
+end 
+Base.length(attr::Attr) = length(union(keys(attr.explicit), keys(attr.defaults)))
+function Base.iterate(attr::Attr)
+    exp_keys = keys(attr.explicit)
+    def_keys = setdiff(keys(attr.defaults), exp_keys)
+    key_list = collect(Iterators.flatten((exp_keys, def_keys)))
+    iterate(attr, (key_list, 1))
+end
+function Base.iterate(attr::Attr, (key_list, i))
+    i > length(key_list) && return nothing
+    k = key_list[i]
+    (k=>attr[k], (key_list, i+1))
+end
+
+Base.copy(attr::Attr) = Attr(copy(attr.explicit), attr.defaults)
+
+RecipesBase.is_explicit(attr::Attr, k) = haskey(attr.explicit,k)
+isdefault(attr::Attr, k) = !is_explicit(attr,k) && haskey(attr.defaults,k)
+
+Base.setindex!(attr::Attr, v, k) = attr.explicit[k] = v
+
+# Reset to default value and return dict
+reset_kw!(attr::Attr, k) = is_explicit(attr, k) ? delete!(attr.explicit, k) : attr
+# Reset to default value and return old value
+pop_kw!(attr::Attr, k) = is_explicit(attr, k) ? pop!(attr.explicit, k) : attr.defaults[k]
+pop_kw!(attr::Attr, k, default) = is_explicit(attr, k) ? pop!(attr.explicit, k) : get(attr.defaults, k, default)
+# Fallbacks for dicts without defaults
+reset_kw!(d::AKW, k) = delete!(d, k)
+pop_kw!(d::AKW, k) = pop!(d, k)
+pop_kw!(d::AKW, k, default) = pop!(d, k, default)
+
 # -----------------------------------------------------------

 mutable struct Series
-    plotattributes::DefaultsDict
+    plotattributes::Attr
 end

 attr(series::Series, k::Symbol) = series.plotattributes[k]
@@ -36,7 +90,7 @@ mutable struct Subplot{T<:AbstractBackend} <: AbstractLayout
    minpad::Tuple # leftpad, toppad, rightpad, bottompad
    bbox::BoundingBox  # the canvas area which is available to this subplot
    plotarea::BoundingBox  # the part where the data goes
-    attr::DefaultsDict  # args specific to this subplot
+    attr::Attr  # args specific to this subplot
    o  # can store backend-specific data... like a pyplot ax
    plt  # the enclosing Plot object (can't give it a type because of no forward declarations)
 end
@@ -48,7 +102,7 @@ Base.show(io::IO, sp::Subplot) = print(io, "Subplot{$(sp[:subplot_index])}")
 # simple wrapper around a KW so we can hold all attributes pertaining to the axis in one place
 mutable struct Axis
    sps::Vector{Subplot}
-    plotattributes::DefaultsDict
+    plotattributes::Attr
 end

 mutable struct Extrema
@@ -67,7 +121,7 @@ const SubplotMap = Dict{Any, Subplot}
 mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
    backend::T                   # the backend type
    n::Int                       # number of series
-    attr::DefaultsDict            # arguments for the whole plot
+    attr::Attr            # arguments for the whole plot
    series_list::Vector{Series}  # arguments for each series
    o                            # the backend's plot object
    subplots::Vector{Subplot}
@@ -78,7 +132,7 @@ mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
 end

 function Plot()
-    Plot(backend(), 0, DefaultsDict(KW(), _plot_defaults), Series[], nothing,
+    Plot(backend(), 0, Attr(KW(), _plot_defaults), Series[], nothing,
         Subplot[], SubplotMap(), EmptyLayout(),
         Subplot[], false)
 end
@@ -1,8 +1,123 @@

+calcMidpoints(edges::AbstractVector) = Float64[0.5 * (edges[i] + edges[i+1]) for i in 1:length(edges)-1]
+
+"Make histogram-like bins of data"
+function binData(data, nbins)
+  lo, hi = ignorenan_extrema(data)
+  edges = collect(range(lo, stop=hi, length=nbins+1))
+  midpoints = calcMidpoints(edges)
+  buckets = Int[max(2, min(searchsortedfirst(edges, x), length(edges)))-1 for x in data]
+  counts = zeros(Int, length(midpoints))
+  for b in buckets
+    counts[b] += 1
+  end
+  edges, midpoints, buckets, counts
+end
+
+"""
+A hacky replacement for a histogram when the backend doesn't support histograms directly.
+Convert it into a bar chart with the appropriate x/y values.
+"""
+function histogramHack(; kw...)
+  plotattributes = KW(kw)
+
+  # we assume that the y kwarg is set with the data to be binned, and nbins is also defined
+  edges, midpoints, buckets, counts = binData(plotattributes[:y], plotattributes[:bins])
+  plotattributes[:x] = midpoints
+  plotattributes[:y] = float(counts)
+  plotattributes[:seriestype] = :bar
+  plotattributes[:fillrange] = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
+  plotattributes
+end
+
+"""
+A hacky replacement for a bar graph when the backend doesn't support bars directly.
+Convert it into a line chart with fillrange set.
+"""
+function barHack(; kw...)
+  plotattributes = KW(kw)
+  midpoints = plotattributes[:x]
+  heights = plotattributes[:y]
+  fillrange = plotattributes[:fillrange] === nothing ? 0.0 : plotattributes[:fillrange]
+
+  # estimate the edges
+  dists = diff(midpoints) * 0.5
+  edges = zeros(length(midpoints)+1)
+  for i in eachindex(edges)
+    if i == 1
+      edge = midpoints[1] - dists[1]
+    elseif i == length(edges)
+      edge = midpoints[i-1] + dists[i-2]
+    else
+      edge = midpoints[i-1] + dists[i-1]
+    end
+    edges[i] = edge
+  end
+
+  x = Float64[]
+  y = Float64[]
+  for i in eachindex(heights)
+    e1, e2 = edges[i:i+1]
+    append!(x, [e1, e1, e2, e2])
+    append!(y, [fillrange, heights[i], heights[i], fillrange])
+  end
+
+  plotattributes[:x] = x
+  plotattributes[:y] = y
+  plotattributes[:seriestype] = :path
+  plotattributes[:fillrange] = fillrange
+  plotattributes
+end
+
+
+"""
+A hacky replacement for a sticks graph when the backend doesn't support sticks directly.
+Convert it into a line chart that traces the sticks, and a scatter that sets markers at the points.
+"""
+function sticksHack(; kw...)
+  plotattributesLine = KW(kw)
+  plotattributesScatter = copy(plotattributesLine)
+
+  # these are the line vertices
+  x = Float64[]
+  y = Float64[]
+  fillrange = plotattributesLine[:fillrange] === nothing ? 0.0 : plotattributesLine[:fillrange]
+
+  # calculate the vertices
+  yScatter = plotattributesScatter[:y]
+  for (i,xi) in enumerate(plotattributesScatter[:x])
+    yi = yScatter[i]
+    for j in 1:3 push!(x, xi) end
+    append!(y, [fillrange, yScatter[i], fillrange])
+  end
+
+  # change the line args
+  plotattributesLine[:x] = x
+  plotattributesLine[:y] = y
+  plotattributesLine[:seriestype] = :path
+  plotattributesLine[:markershape] = :none
+  plotattributesLine[:fillrange] = nothing
+
+  # change the scatter args
+  plotattributesScatter[:seriestype] = :none
+
+  plotattributesLine, plotattributesScatter
+end
+
+function regressionXY(x, y)
+  # regress
+  β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)
+
+  # make a line segment
+  regx = [ignorenan_minimum(x), ignorenan_maximum(x)]
+  regy = β * regx + α
+  regx, regy
+end
+
 function replace_image_with_heatmap(z::Array{T}) where T<:Colorant
    n, m = size(z)
-    colors = palette(vec(z))
-    newz = reshape(1:n*m, n, m)
+    colors = ColorGradient(vec(z))
+    newz = reshape(range(0, stop=1, length=n*m), n, m)
    newz, colors
 end

@@ -79,7 +194,7 @@ function iter_segments(series::Series)
        end
    else
        segs = UnitRange{Int}[]
-        args = RecipesPipeline.is3d(series) ? (x, y, z) : (x, y)
+        args = is3d(series) ? (x, y, z) : (x, y)
        for seg in iter_segments(args...)
            push!(segs, seg)
        end
@@ -130,13 +245,11 @@ _cycle(v::AVec, indices::AVec{Int}) = map(i -> _cycle(v,i), indices)
 _cycle(v::AMat, indices::AVec{Int}) = map(i -> _cycle(v,i), indices)
 _cycle(v, indices::AVec{Int})       = fill(v, length(indices))

-_cycle(cl::PlotUtils.AbstractColorList, idx::Int) = cl[mod1(idx, end)]
-_cycle(cl::PlotUtils.AbstractColorList, idx::AVec{Int}) = cl[mod1.(idx, end)]
+_cycle(grad::ColorGradient, idx::Int) = _cycle(grad.colors, idx)
+_cycle(grad::ColorGradient, indices::AVec{Int}) = _cycle(grad.colors, indices)

-_as_gradient(grad) = grad
-_as_gradient(v::AbstractVector{<:Colorant}) = cgrad(v)
-_as_gradient(cp::ColorPalette) = cgrad(cp, categorical = true)
-_as_gradient(c::Colorant) = cgrad([c, c])
+_as_gradient(grad::ColorGradient) = grad
+_as_gradient(c::Colorant) = ColorGradient([c,c])

 makevec(v::AVec) = v
 makevec(v::T) where {T} = T[v]
@@ -145,27 +258,32 @@ makevec(v::T) where {T} = T[v]
 maketuple(x::Real)                     = (x,x)
 maketuple(x::Tuple{T,S}) where {T,S} = x

+mapFuncOrFuncs(f::Function, u::AVec)        = map(f, u)
+mapFuncOrFuncs(fs::AVec{F}, u::AVec) where {F<:Function} = [map(f, u) for f in fs]
+
 for i in 2:4
-    @eval begin
-        RecipesPipeline.unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
+  @eval begin
+    unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
                   AVec{<:GeometryTypes.Point{$i}}}) = $(Expr(:tuple, (:([t[$j] for t in v]) for j=1:i)...))
-    end
+  end
 end

-RecipesPipeline.unzip(v::Union{AVec{<:GeometryTypes.Point{N}},
+unzip(v::Union{AVec{<:GeometryTypes.Point{N}},
               AVec{<:Tuple{Vararg{T,N} where T}}}) where N = error("$N-dimensional unzip not implemented.")
-RecipesPipeline.unzip(v::Union{AVec{<:GeometryTypes.Point},
+unzip(v::Union{AVec{<:GeometryTypes.Point},
               AVec{<:Tuple}}) = error("Can't unzip points of different dimensions.")

 # given 2-element lims and a vector of data x, widen lims to account for the extrema of x
 function _expand_limits(lims, x)
-    try
-        e1, e2 = ignorenan_extrema(x)
-        lims[1] = NaNMath.min(lims[1], e1)
-        lims[2] = NaNMath.max(lims[2], e2)
-    catch
-    end
-    nothing
+  try
+    e1, e2 = ignorenan_extrema(x)
+    lims[1] = NaNMath.min(lims[1], e1)
+    lims[2] = NaNMath.max(lims[2], e2)
+  # catch err
+  #   @warn(err)
+  catch
+  end
+  nothing
 end

 expand_data(v, n::Integer) = [_cycle(v, i) for i=1:n]
@@ -183,21 +301,21 @@ function addOrReplace(v::AbstractVector, t::DataType, args...; kw...)
 end

 function replaceType(vec, val)
-    filter!(x -> !isa(x, typeof(val)), vec)
-    push!(vec, val)
+  filter!(x -> !isa(x, typeof(val)), vec)
+  push!(vec, val)
 end

 function replaceAlias!(plotattributes::AKW, k::Symbol, aliases::Dict{Symbol,Symbol})
-    if haskey(aliases, k)
-        plotattributes[aliases[k]] = RecipesPipeline.pop_kw!(plotattributes, k)
-    end
+  if haskey(aliases, k)
+    plotattributes[aliases[k]] = pop_kw!(plotattributes, k)
+  end
 end

 function replaceAliases!(plotattributes::AKW, aliases::Dict{Symbol,Symbol})
-    ks = collect(keys(plotattributes))
-    for k in ks
-        replaceAlias!(plotattributes, k, aliases)
-    end
+  ks = collect(keys(plotattributes))
+  for k in ks
+      replaceAlias!(plotattributes, k, aliases)
+  end
 end

 createSegments(z) = collect(repeat(reshape(z,1,:),2,1))[2:end]
@@ -208,21 +326,28 @@ Base.first(x::Symbol) = x

 sortedkeys(plotattributes::Dict) = sort(collect(keys(plotattributes)))

+
+const _scale_base = Dict{Symbol, Real}(
+    :log10 => 10,
+    :log2 => 2,
+    :ln => ℯ,
+)
+
 function _heatmap_edges(v::AVec, isedges::Bool = false)
-    length(v) == 1 && return v[1] .+ [-0.5, 0.5]
-    if isedges return v end
-    # `isedges = true` means that v is a vector which already describes edges
-    # and does not need to be extended.
-    vmin, vmax = ignorenan_extrema(v)
-    extra_min = (v[2] - v[1]) / 2
-    extra_max = (v[end] - v[end - 1]) / 2
-    vcat(vmin-extra_min, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra_max)
+  length(v) == 1 && return v[1] .+ [-0.5, 0.5]
+  if isedges return v end
+  # `isedges = true` means that v is a vector which already describes edges
+  # and does not need to be extended.
+  vmin, vmax = ignorenan_extrema(v)
+  extra_min = (v[2] - v[1]) / 2
+  extra_max = (v[end] - v[end - 1]) / 2
+  vcat(vmin-extra_min, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra_max)
 end

 "create an (n+1) list of the outsides of heatmap rectangles"
 function heatmap_edges(v::AVec, scale::Symbol = :identity, isedges::Bool = false)
-    f, invf = RecipesPipeline.scale_func(scale), RecipesPipeline.inverse_scale_func(scale)
-    map(invf, _heatmap_edges(map(f,v), isedges))
+  f, invf = scalefunc(scale), invscalefunc(scale)
+  map(invf, _heatmap_edges(map(f,v), isedges))
 end

 function heatmap_edges(x::AVec, xscale::Symbol, y::AVec, yscale::Symbol, z_size::Tuple{Int, Int})
@@ -242,8 +367,8 @@ function heatmap_edges(x::AVec, xscale::Symbol, y::AVec, yscale::Symbol, z_size:
 end

 function is_uniformly_spaced(v; tol=1e-6)
-    dv = diff(v)
-    maximum(dv) - minimum(dv) < tol * mean(abs.(dv))
+  dv = diff(v)
+  maximum(dv) - minimum(dv) < tol * mean(abs.(dv))
 end

 function convert_to_polar(theta, r, r_extrema = ignorenan_extrema(r))
@@ -255,11 +380,11 @@ function convert_to_polar(theta, r, r_extrema = ignorenan_extrema(r))
 end

 function fakedata(sz...)
-    y = zeros(sz...)
-    for r in 2:size(y,1)
-        y[r,:] = 0.95 * vec(y[r-1,:]) + randn(size(y,2))
-    end
-    y
+  y = zeros(sz...)
+  for r in 2:size(y,1)
+    y[r,:] = 0.95 * vec(y[r-1,:]) + randn(size(y,2))
+  end
+  y
 end

 isijulia() = :IJulia in nameof.(collect(values(Base.loaded_modules)))
@@ -516,7 +641,8 @@ for comp in (:line, :fill, :marker)
            if z === nothing
                isa(c, ColorGradient) ? c : plot_color(_cycle(c, i))
            else
-                get(get_gradient(c), z[i], (cmin, cmax))
+                grad = isa(c, ColorGradient) ? c : cgrad()
+                grad[clamp((_cycle(z, i) - cmin) / (cmax - cmin), 0, 1)]
            end
        end

@@ -534,28 +660,9 @@ for comp in (:line, :fill, :marker)
    end
 end

-function get_colorgradient(series::Series)
-    st = series[:seriestype]
-    if st in (:surface, :heatmap) || isfilledcontour(series)
-        series[:fillcolor]
-    elseif st in (:contour, :wireframe)
-        series[:linecolor]
-    elseif series[:marker_z] !== nothing
-        series[:markercolor]
-    elseif series[:line_z] !==  nothing
-        series[:linecolor]
-    elseif series[:fill_z] !== nothing
-        series[:fillcolor]
-    end
-end
-
 single_color(c, v = 0.5) = c
 single_color(grad::ColorGradient, v = 0.5) = grad[v]

-get_gradient(c) = cgrad()
-get_gradient(cg::ColorGradient) = cg
-get_gradient(cp::ColorPalette) = cgrad(cp, categorical = true)
-
 function get_linewidth(series, i::Int = 1)
    _cycle(series[:linewidth], i)
 end
@@ -610,9 +717,6 @@ makekw(; kw...) = KW(kw)
 wraptuple(x::Tuple) = x
 wraptuple(x) = (x,)

-trueOrAllTrue(f::Function, x::AbstractArray) = all(f, x)
-trueOrAllTrue(f::Function, x) = f(x)
-
 allLineTypes(arg)   = trueOrAllTrue(a -> get(_typeAliases, a, a) in _allTypes, arg)
 allStyles(arg)      = trueOrAllTrue(a -> get(_styleAliases, a, a) in _allStyles, arg)
 allShapes(arg)      = trueOrAllTrue(a -> is_marker_supported(get(_markerAliases, a, a)), arg) ||
@@ -645,107 +749,119 @@ function with(f::Function, args...; kw...)
        newdefs[:legend] = false
    end

-    # dict to store old and new keyword args for anything that changes
-    olddefs = KW()
-    for k in keys(newdefs)
-        olddefs[k] = default(k)
+  # dict to store old and new keyword args for anything that changes
+  olddefs = KW()
+  for k in keys(newdefs)
+    olddefs[k] = default(k)
+  end
+
+  # save the backend
+  if CURRENT_BACKEND.sym == :none
+    _pick_default_backend()
+  end
+  oldbackend = CURRENT_BACKEND.sym
+
+  for arg in args
+
+    # change backend?
+    if arg in backends()
+      backend(arg)
    end

-    # save the backend
-    if CURRENT_BACKEND.sym == :none
-        _pick_default_backend()
-    end
-    oldbackend = CURRENT_BACKEND.sym
+    # # TODO: generalize this strategy to allow args as much as possible
+    # #       as in:  with(:gr, :scatter, :legend, :grid) do; ...; end
+    # # TODO: can we generalize this enough to also do something similar in the plot commands??

-    for arg in args
+    # k = :seriestype
+    # if arg in _allTypes
+    #   olddefs[k] = default(k)
+    #   newdefs[k] = arg
+    # elseif haskey(_typeAliases, arg)
+    #   olddefs[k] = default(k)
+    #   newdefs[k] = _typeAliases[arg]
+    # end

-        # change backend?
-        if arg in backends()
-            backend(arg)
-        end
-
-        # TODO: generalize this strategy to allow args as much as possible
-        #       as in:  with(:gr, :scatter, :legend, :grid) do; ...; end
-        # TODO: can we generalize this enough to also do something similar in the plot commands??
-
-        # k = :seriestype
-        # if arg in _allTypes
-        #     olddefs[k] = default(k)
-        #     newdefs[k] = arg
-        # elseif haskey(_typeAliases, arg)
-        #     olddefs[k] = default(k)
-        #     newdefs[k] = _typeAliases[arg]
-        # end
-
-        k = :legend
-        if arg in (k, :leg)
-            olddefs[k] = default(k)
-            newdefs[k] = true
-        end
-
-        k = :grid
-        if arg == k
-            olddefs[k] = default(k)
-            newdefs[k] = true
-        end
+    k = :legend
+    if arg in (k, :leg)
+      olddefs[k] = default(k)
+      newdefs[k] = true
    end

-    # display(olddefs)
-    # display(newdefs)
-
-    # now set all those defaults
-    default(; newdefs...)
-
-    # call the function
-    ret = f()
-
-    # put the defaults back
-    default(; olddefs...)
-
-    # revert the backend
-    if CURRENT_BACKEND.sym != oldbackend
-        backend(oldbackend)
+    k = :grid
+    if arg == k
+      olddefs[k] = default(k)
+      newdefs[k] = true
    end
+  end

-    # return the result of the function
-    ret
+  # display(olddefs)
+  # display(newdefs)
+
+  # now set all those defaults
+  default(; newdefs...)
+
+  # call the function
+  ret = f()
+
+  # put the defaults back
+  default(; olddefs...)
+
+  # revert the backend
+  if CURRENT_BACKEND.sym != oldbackend
+    backend(oldbackend)
+  end
+
+  # return the result of the function
+  ret
 end

 # ---------------------------------------------------------------
 # ---------------------------------------------------------------

 mutable struct DebugMode
-    on::Bool
+  on::Bool
 end
 const _debugMode = DebugMode(false)

 function debugplots(on = true)
-    _debugMode.on = on
+  _debugMode.on = on
 end

 debugshow(io, x) = show(io, x)
 debugshow(io, x::AbstractArray) = print(io, summary(x))

 function dumpdict(io::IO, plotattributes::AKW, prefix = "", alwaysshow = false)
-    _debugMode.on || alwaysshow || return
-    println(io)
-    if prefix != ""
-        println(io, prefix, ":")
-    end
-    for k in sort(collect(keys(plotattributes)))
-        @printf("%14s: ", k)
-        debugshow(io, plotattributes[k])
-        println(io)
-    end
+  _debugMode.on || alwaysshow || return
+  println(io)
+  if prefix != ""
+    println(io, prefix, ":")
+  end
+  for k in sort(collect(keys(plotattributes)))
+    @printf("%14s: ", k)
+    debugshow(io, plotattributes[k])
    println(io)
+  end
+  println(io)
 end
 DD(io::IO, plotattributes::AKW, prefix = "") = dumpdict(io, plotattributes, prefix, true)
 DD(plotattributes::AKW, prefix = "") = DD(stdout, plotattributes, prefix)

 function dumpcallstack()
-    error()  # well... you wanted the stacktrace, didn't you?!?
+  error()  # well... you wanted the stacktrace, didn't you?!?
 end

+# ---------------------------------------------------------------
+# ---------------------------------------------------------------
+# used in updating an existing series
+
+extendSeriesByOne(v::UnitRange{Int}, n::Int = 1) = isempty(v) ? (1:n) : (minimum(v):maximum(v)+n)
+extendSeriesByOne(v::AVec, n::Integer = 1)       = isempty(v) ? (1:n) : vcat(v, (1:n) + ignorenan_maximum(v))
+extendSeriesData(v::AbstractRange{T}, z::Real) where {T}        = extendSeriesData(float(collect(v)), z)
+extendSeriesData(v::AbstractRange{T}, z::AVec) where {T}        = extendSeriesData(float(collect(v)), z)
+extendSeriesData(v::AVec{T}, z::Real) where {T}         = (push!(v, convert(T, z)); v)
+extendSeriesData(v::AVec{T}, z::AVec) where {T}         = (append!(v, convert(Vector{T}, z)); v)
+
+
 # -------------------------------------------------------
 # NOTE: backends should implement the following methods to get/set the x/y/z data objects

@@ -789,66 +905,39 @@ Base.setindex!(plt::Plot, xy::Tuple{X,Y}, i::Integer) where {X,Y} = (setxy!(plt,
 Base.setindex!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z} = (setxyz!(plt, xyz, i); plt)

 # -------------------------------------------------------
+
 # operate on individual series

-Base.push!(series::Series, args...) = extend_series!(series, args...)
-Base.append!(series::Series, args...) = extend_series!(series, args...)
-
-function extend_series!(series::Series, yi)
-    y = extend_series_data!(series, yi, :y)
-    x = extend_to_length!(series[:x], length(y))
-    expand_extrema!(series[:subplot][:xaxis], x)
-    return x, y
+function push_x!(series::Series, xi)
+    push!(series[:x], xi)
+    expand_extrema!(series[:subplot][:xaxis], xi)
+    return
+end
+function push_y!(series::Series, yi)
+    push!(series[:y], yi)
+    expand_extrema!(series[:subplot][:yaxis], yi)
+    return
+end
+function push_z!(series::Series, zi)
+    push!(series[:z], zi)
+    expand_extrema!(series[:subplot][:zaxis], zi)
+    return
 end

-function extend_series!(series::Series, xi, yi)
-    x = extend_series_data!(series, xi, :x)
-    y = extend_series_data!(series, yi, :y)
-    return x, y
-end
-
-function extend_series!(series::Series, xi, yi, zi)
-    x = extend_series_data!(series, xi, :x)
-    y = extend_series_data!(series, yi, :y)
-    z = extend_series_data!(series, zi, :z)
-    return x, y, z
-end
-
-function extend_series_data!(series::Series, v, letter)
-    copy_series!(series, letter)
-    d = extend_by_data!(series[letter], v)
-    expand_extrema!(series[:subplot][Symbol(letter, :axis)], d)
-    return d
-end
-
-function copy_series!(series, letter)
-    plt = series[:plot_object]
-    for s in plt.series_list
-        for l in (:x, :y, :z)
-            if s !== series || l !== letter
-                if s[l] === series[letter]
-                    series[letter] = copy(series[letter])
-                end
-            end
-        end
-    end
-end
-
-extend_to_length!(v::AbstractRange, n) = range(first(v), step = step(v), length = n)
-function extend_to_length!(v::AbstractVector, n)
-    vmax = isempty(v) ? 0 : ignorenan_maximum(v)
-    extend_by_data!(v, vmax .+ (1:(n - length(v))))
-end
-extend_by_data!(v::AbstractVector, x) = isimmutable(v) ? vcat(v, x) : push!(v, x)
-function extend_by_data!(v::AbstractVector, x::AbstractVector)
-    isimmutable(v) ? vcat(v, x) : append!(v, x)
+function Base.push!(series::Series, yi)
+    x = extendSeriesByOne(series[:x])
+    expand_extrema!(series[:subplot][:xaxis], x[end])
+    series[:x] = x
+    push_y!(series, yi)
 end
+Base.push!(series::Series, xi, yi) = (push_x!(series,xi); push_y!(series,yi))
+Base.push!(series::Series, xi, yi, zi) = (push_x!(series,xi); push_y!(series,yi); push_z!(series,zi))

 # -------------------------------------------------------

 function attr!(series::Series; kw...)
    plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
    for (k,v) in plotattributes
        if haskey(_series_defaults, k)
            series[k] = v
@@ -862,7 +951,7 @@ end

 function attr!(sp::Subplot; kw...)
    plotattributes = KW(kw)
-    RecipesPipeline.preprocess_attributes!(plotattributes)
+    preprocessArgs!(plotattributes)
    for (k,v) in plotattributes
        if haskey(_subplot_defaults, k)
            sp[k] = v
@@ -876,16 +965,59 @@ end
 # -------------------------------------------------------
 # push/append for one series

-Base.push!(plt::Plot, args::Real...) = push!(plt, 1, args...)
-Base.push!(plt::Plot, i::Integer, args::Real...) = push!(plt.series_list[i], args...)
-Base.append!(plt::Plot, args::AbstractVector...) = append!(plt, 1, args...)
-Base.append!(plt::Plot, i::Integer, args::Real...) = append!(plt.series_list[i], args...)
+# push value to first series
+Base.push!(plt::Plot, y::Real) = push!(plt, 1, y)
+Base.push!(plt::Plot, x::Real, y::Real) = push!(plt, 1, x, y)
+Base.push!(plt::Plot, x::Real, y::Real, z::Real) = push!(plt, 1, x, y, z)
+
+# y only
+function Base.push!(plt::Plot, i::Integer, y::Real)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesByOne(xdata), extendSeriesData(ydata, y)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, y::AVec)
+    xdata, ydata = plt[i]
+    if !isa(xdata, UnitRange{Int})
+        error("Expected x is a UnitRange since you're trying to push a y value only")
+    end
+    plt[i] = (extendSeriesByOne(xdata, length(y)), extendSeriesData(ydata, y))
+    plt
+end
+
+# x and y
+function Base.push!(plt::Plot, i::Integer, x::Real, y::Real)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec)
+    @assert length(x) == length(y)
+    xdata, ydata = getxy(plt, i)
+    setxy!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y)), i)
+    plt
+end
+
+# x, y, and z
+function Base.push!(plt::Plot, i::Integer, x::Real, y::Real, z::Real)
+    # @show i, x, y, z
+    xdata, ydata, zdata = getxyz(plt, i)
+    # @show xdata, ydata, zdata
+    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
+    plt
+end
+function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec, z::AVec)
+    @assert length(x) == length(y) == length(z)
+    xdata, ydata, zdata = getxyz(plt, i)
+    setxyz!(plt, (extendSeriesData(xdata, x), extendSeriesData(ydata, y), extendSeriesData(zdata, z)), i)
+    plt
+end

 # tuples
-Base.push!(plt::Plot, t::Tuple) = push!(plt, 1, t...)
-Base.push!(plt::Plot, i::Integer, t::Tuple) = push!(plt, i, t...)
-Base.append!(plt::Plot, t::Tuple) = append!(plt, 1, t...)
-Base.append!(plt::Plot, i::Integer, t::Tuple) = append!(plt, i, t...)
+Base.push!(plt::Plot, xy::Tuple{X,Y}) where {X,Y}                  = push!(plt, 1, xy...)
+Base.push!(plt::Plot, xyz::Tuple{X,Y,Z}) where {X,Y,Z}             = push!(plt, 1, xyz...)
+Base.push!(plt::Plot, i::Integer, xy::Tuple{X,Y}) where {X,Y}      = push!(plt, i, xy...)
+Base.push!(plt::Plot, i::Integer, xyz::Tuple{X,Y,Z}) where {X,Y,Z} = push!(plt, i, xyz...)

 # -------------------------------------------------------
 # push/append for all series
@@ -1084,7 +1216,7 @@ end
 function shape_data(series, expansion_factor = 1)
    sp = series[:subplot]
    xl, yl = isvertical(series) ? (xlims(sp), ylims(sp)) : (ylims(sp), xlims(sp))
-    x, y = copy(series[:x]), copy(series[:y])
+    x, y = series[:x], series[:y]
    factor = 100
    for i in eachindex(x)
        if x[i] == -Inf
@@ -9,7 +9,6 @@ using LibGit2
 using GeometryTypes
 using Dates

-include("test_hdf5plots.jl")
 include("test_pgfplotsx.jl")

 reference_dir(args...) = joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
@@ -47,27 +46,26 @@ img_tol = is_ci() ? 1e-2 : Sys.islinux() ? 1e-3 : 0.1

 ## Uncomment the following lines to update reference images for different backends

-# @testset "GR" begin
-#     image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
-# end
-#
-# plotly()
-# @testset "Plotly" begin
-#     image_comparison_facts(:plotly, tol=img_tol, skip = Plots._backend_skips[:plotlyjs])
-# end
-#
-# pyplot()
-# @testset "PyPlot" begin
-#     image_comparison_facts(:pyplot, tol=img_tol, skip = Plots._backend_skips[:pyplot])
-# end
-#
-# pgfplotsx()
-# @testset "PGFPlotsX" begin
-#     image_comparison_facts(:pgfplotsx, tol=img_tol, skip = Plots._backend_skips[:pgfplotsx])
-# end
+#=
+@testset "GR" begin
+    image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
+end

-# 10 Histogram2D
+plotly()
+@testset "Plotly" begin
+    image_comparison_facts(:plotly, tol=img_tol, skip = Plots._backend_skips[:plotlyjs])
+end

+pyplot()
+@testset "PyPlot" begin
+    image_comparison_facts(:pyplot, tol=img_tol, skip = Plots._backend_skips[:pyplot])
+end
+
+pgfplots()
+@testset "PGFPlots" begin
+    image_comparison_facts(:pgfplots, tol=img_tol, skip = Plots._backend_skips[:pgfplots])
+end
+=#
 ##

@testset "Backends" begin
@@ -1,21 +0,0 @@
-using Plots, HDF5
-
-
-@testset "HDF5_Plots" begin
-	fname = "tmpplotsave.hdf5"
-	hdf5()
-
-	x = 1:10
-	psrc=plot(x, x.*x); #Create some plot
-	Plots.hdf5plot_write(psrc, fname)
-
-	#Read back file:
-	gr() #Choose some fast backend likely to work in test environment.
-	pread = Plots.hdf5plot_read(fname)
-
-	#Make sure data made it through:
-	@test psrc.subplots[1].series_list[1][:x] == pread.subplots[1].series_list[1][:x]
-	@test psrc.subplots[1].series_list[1][:y] == pread.subplots[1].series_list[1][:y]
-
-	#display(pread) #Don't display. Regression env might not support
-end #testset
@@ -20,19 +20,6 @@ end
   @test count(x -> x isa PGFPlotsX.Plot, axis.contents) == 1
   @test !haskey(axis.contents[1].options.dict, "fill")

-   @testset "Legends" begin
-      legends_plot =  plot( rand(5,2), lab = ["1" ""] )
-      scatter!(legends_plot, rand(5) )
-      Plots._update_plot_object(legends_plot)
-      axis_contents = Plots.pgfx_axes(legends_plot.o)[1].contents
-      leg_entries = filter( x -> x isa PGFPlotsX.LegendEntry, axis_contents )
-      series = filter( x -> x isa PGFPlotsX.Plot, axis_contents )
-      @test length(leg_entries) == 2
-      @test !haskey(series[1].options.dict, "forget plot")
-      @test haskey(series[2].options.dict, "forget plot")
-      @test !haskey(series[3].options.dict, "forget plot")
-   end # testset
-
   @testset "3D docs example" begin
      n = 100
      ts = range(0, stop = 8π, length = n)
@@ -71,7 +58,7 @@ end
      pl = scatter!(
         y,
         zcolor = abs.(y .- 0.5),
-         m = (:hot, 0.8, Plots.stroke(1, :green)),
+         m = (:heat, 0.8, Plots.stroke(1, :green)),
         ms = 10 * abs.(y .- 0.5) .+ 4,
         lab = ["grad", "", "ient"],
      )
@@ -84,21 +71,11 @@ end
      @test marker.options["mark"] == "*"
      @test marker.options["mark options"]["color"] ==
            RGBA{Float64}(colorant"green", 0.8)
-      @test marker.options["mark options"]["line width"] == 0.75 # 1px is 0.75pt
+      @test marker.options["mark options"]["line width"] == 1
   end # testset
   @testset "Plot in pieces" begin
-      pic = plot(rand(100) / 3, reg = true, fill = (0, :green))
-      scatter!(pic, rand(100), markersize = 6, c = :orange)
-      Plots._update_plot_object(pic)
-      axis_contents = Plots.pgfx_axes(pic.o)[1].contents
-      leg_entries = filter( x -> x isa PGFPlotsX.LegendEntry, axis_contents )
-      series = filter( x -> x isa PGFPlotsX.Plot, axis_contents )
-      @test length(leg_entries) == 2
-      @test length(series) == 4
-      @test haskey(series[1].options.dict, "forget plot")
-      @test !haskey(series[2].options.dict, "forget plot")
-      @test haskey(series[3].options.dict, "forget plot")
-      @test !haskey(series[4].options.dict, "forget plot")
+      plot(rand(100) / 3, reg = true, fill = (0, :green))
+      scatter!(rand(100), markersize = 6, c = :orange)
   end # testset
   @testset "Marker types" begin
      markers = filter((m -> begin
@@ -122,7 +99,7 @@ end
      plot(
         Plots.fakedata(100, 10),
         layout = 4,
-         palette = [:grays :blues :hot :rainbow],
+         palette = [:grays :blues :heat :lightrainbow],
         bg_inside = [:orange :pink :darkblue :black],
      )
   end # testset
@@ -211,7 +188,7 @@ end
         marker_z = ((x, y) -> begin
            x + y
         end),
-         color = :bwr,
+         color = :bluesreds,
         legend = false,
      )
      plot(p1, p2)
@@ -245,39 +222,15 @@ end
   end # testset
   @testset "Annotations" begin
      y = rand(10)
-      pgfx_plot = plot(
+      plot(
         y,
         annotations = (3, y[3], Plots.text("this is \\#3", :left)),
         leg = false,
      )
-      Plots._update_plot_object(pgfx_plot)
-      axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
-      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-      @test length(nodes) == 1
-      mktempdir() do path
-         file_path =joinpath(path,"annotations.tex")
-         @test_nowarn savefig(pgfx_plot, file_path)
-         open(file_path) do io
-            lines = readlines(io)
-            @test count(s -> occursin("node", s), lines) == 1
-         end
-      end
      annotate!([
         (5, y[5], Plots.text("this is \\#5", 16, :red, :center)),
         (10, y[10], Plots.text("this is \\#10", :right, 20, "courier")),
      ])
-      Plots._update_plot_object(pgfx_plot)
-      axis_content = Plots.pgfx_axes(pgfx_plot.o)[1].contents
-      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-      @test length(nodes) == 3
-      mktempdir() do path
-         file_path =joinpath(path,"annotations.tex")
-         @test_nowarn savefig(pgfx_plot, file_path)
-         open(file_path) do io
-            lines = readlines(io)
-            @test count(s -> occursin("node", s), lines) == 3
-         end
-      end
      annotation_plot = scatter!(
         range(2, stop = 8, length = 6),
         rand(6),
@@ -291,18 +244,9 @@ end
            Plots.text("data", :green),
         ],
      )
-      Plots._update_plot_object(annotation_plot)
-      axis_content = Plots.pgfx_axes(annotation_plot.o)[1].contents
-      nodes = filter(x -> !isa(x, PGFPlotsX.Plot), axis_content)
-      @test length(nodes) == 9
-      mktempdir() do path
-         file_path =joinpath(path,"annotations.tex")
-         @test_nowarn savefig(annotation_plot, file_path)
-         open(file_path) do io
-            lines = readlines(io)
-            @test count(s -> occursin("node", s), lines) == 9
-         end
-      end
+      # mktempdir() do path
+      #    @test_nowarn savefig(annotation_plot, path*"annotation.pdf")
+      # end
   end # testset
   @testset "Ribbon" begin
      aa = rand(10)
Author	SHA1	Message	Date
Michael Krabbe Borregaard	8eac99a389	Merge pull request #2469 from JuliaPlots/bbs/remove-defaults remove default recipes	2020-03-16 22:48:38 +01:00
Simon Christ	a65d41ca39	move Volume	2020-03-15 21:48:51 +01:00
Simon Christ	dd25893a70	move Surface and trueOrAllTrue	2020-03-15 21:22:59 +01:00
Simon Christ	52c081758d	move Formatted and import	2020-03-15 21:14:16 +01:00
Simon Christ	7ed9fbd7fc	factor out SliceIt dependencies	2020-03-15 18:11:46 +01:00
Simon Christ	6bb53b5181	remove default recipes	2020-03-15 16:53:54 +01:00
Simon Christ	9d57817bdf	Update plot.jl (#2467 ) * implement the recipe_pipeline * delete _plot! * Update plot.jl fix: https://github.com/mkborregaard/RecipePipeline.jl/issues/7	2020-03-15 15:40:49 +01:00
Anshul Singhvi	4b94a8c2f6	Fix un-imported symbol (#2468 ) ensure that the pipeline works	2020-03-15 13:36:51 +01:00
Anshul Singhvi	aafc1e1989	change the `is_st_supported` signature (#2466 )	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	4e6c64ebcc	Add finalize_subplot!	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	cb103598d7	Fix typo _process_userrecipes now calls the correct _process_userrecipe	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	5728e9fb46	rename	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	74a6520960	Rename _typeAliases to type_aliases	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	f557ca3b74	Disable precompile file for now	2020-03-15 13:36:51 +01:00
Sebastian Micluța-Câmpeanu	bb08d61709	Add _recipe_before_series	2020-03-15 13:36:51 +01:00
Simon Christ	857d37c380	[skip ci] more bangs	2020-03-15 13:36:51 +01:00
Simon Christ	261f47fb6c	delete _plot!	2020-03-15 13:36:51 +01:00
Simon Christ	476769fab6	add bangs	2020-03-15 13:36:51 +01:00
Simon Christ	f7282dd49a	implement the recipe_pipeline	2020-03-15 13:36:51 +01:00
Michael Krabbe Borregaard	5f09d97ca0	add function stubs from recipeutils	2020-03-15 13:36:51 +01:00
Michael Krabbe Borregaard	e4754f3aeb	Move out three functions	2020-03-15 13:36:51 +01:00
Anshul Singhvi	43fd0e76be	Manually add the unregistered package in Travis	2020-03-15 13:36:51 +01:00
Michael Krabbe Borregaard	3ed781ac2d	depend on recipeutils	2020-03-15 13:36:51 +01:00