use correct revision

use name
2019-01-31 18:50:20 +01:00 · 2019-01-31 18:27:54 +01:00
54 changed files with 3978 additions and 7592 deletions
@@ -1,24 +0,0 @@
-name: CompatHelper
-
-on:
-  schedule:
-    - cron: '00 * * * *'
-
-jobs:
-  CompatHelper:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        julia-version: [1.2.0]
-        julia-arch: [x86]
-        os: [ubuntu-latest]
-    steps:
-      - uses: julia-actions/setup-julia@latest
-        with:
-          version: ${{ matrix.julia-version }}
-      - name: Pkg.add("CompatHelper")
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
-      - name: CompatHelper.main()
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: julia -e 'using CompatHelper; CompatHelper.main()'
@@ -1,11 +0,0 @@
-name: TagBot
-on:
-  schedule:
-    - cron: 0 * * * *
-jobs:
-  TagBot:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: JuliaRegistries/TagBot@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
@@ -7,6 +7,3 @@ examples/meetup/.ipynb_checkpoints/*
 deps/plotly-latest.min.js
 deps/build.log
 deps/deps.jl
-Manifest.toml
-dev/
-test/tmpplotsave.hdf5
@@ -4,41 +4,57 @@ os:
  - linux
  # - osx
 julia:
-  - 1.0
-  - 1
+  # - 1.0
  - nightly
+# matrix:
+#   allow_failures:
+#     - julia: nightly

-matrix:
-  allow_failures:
-  - julia: nightly
+# # before install:
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update          ; fi
+# #   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi

-addons:
-  apt:
-    packages:
-      - at-spi2-core
-      - libgtk-3-dev
-      - xauth
-      - xvfb
-
-env:
-  - GKS_ENCODING="utf8"
-
-cache:
-  directories:
-  - $HOME/.julia/artifacts
+# ref: http://askubuntu.com/a/556672 for the wkhtmltopdf apt repository info

 sudo: required
 before_install:
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pwd ; fi
  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/install_wkhtmltoimage.sh ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo add-apt-repository -y ppa:pov/wkhtmltopdf  ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo apt-get -qq update                      ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  sudo apt-get install -y wkhtmltopdf          ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  wkhtmltopdf -V                               ; fi
+#   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then  wkhtmltoimage -V                             ; fi
+#   echo 'exec xvfb-run -a -s "-screen 0 640x480x16" wkhtmltopdf "$@"' | sudo tee /usr/local/bin/wkhtmltopdf.sh >/dev/null
+# sudo chmod a+x /usr/local/bin/wkhtmltopdf.sh
+
+# # borrowed from Blink.jl's travis file
+# matrix:
+#   include:
+#     - os: linux
+#       julia: 0.4
+#       env: TESTCMD="xvfb-run julia"
+#     - os: osx
+#       julia: 0.4
+#       env: TESTCMD="julia"
+
+

 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)'
+# uncomment the following lines to override the default test script
+# script:
+ # - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+ # - julia -e 'import Pkg; Pkg.add(Pkg.PackageSpec(path=pwd())); Pkg.build("Plots")'
+ # - julia test/travis_commands.jl
+ # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")'
+ # - julia -e 'Pkg.clone("GR"); Pkg.build("GR")'
+ # # - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")'
+ # - julia -e 'Pkg.clone("https://github.com/tbreloff/ExamplePlots.jl.git");'
+ # # - julia -e 'Pkg.clone("https://github.com/JunoLab/Blink.jl.git"); Pkg.build("Blink"); import Blink; Blink.AtomShell.install()'
+ # # - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")'
+ # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")'
+ #
+ # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)'
+ # - julia -e 'Pkg.test("Plots"; coverage=false)'
+ # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
@@ -3,115 +3,14 @@

 #### notes on release changes, ongoing development, and future planned work

+- Minor version 0.17 is the last one to support Julia 0.6!!
+- Minor version 0.11 is the last one to support Julia 0.5!!
+	- Critical bugfixes only
+    - `backports` branch is for Julia 0.5
+
+---
 ## (current master)

-## 0.28.3
- support generalized array interface
- save to pdf, svg and eps in plotlyjs
- fix for clims in line_z
- optimize heatmap logic in gr
-
-## 0.26.3
- fix `vline` with dates
- fix PyPlot logscale bug
- avoid annotation clipping for PyPlot
- allow plotting of Any vectors and 3D plotting again in convertToAnyVector
- specify legend title font in GR and PyPlot
- delete `pushtomaster.sh`
- use `=== nothing`
-
-## 0.26.2
- improve empty animation build error
- fix GR axis flip for heatmaps and images
- fix ribbons specified as tuples
- add Char recipe
- fix Plotly plots with single-element series
- rewrite PlotlyJS backend
-
-## 0.26.1
- handle `Char`s as input data
- fix html saving for Plotly
- expand ~ in paths on UNIX systems
- convertToAnyVector clean-up
- fix color_palette grouping issue
-
-## 0.26.0
- use FFMPEG.jl
- add missing method for convertToAnyVector
-
-## 0.25.3
- add areaplot
- allow missing in z_color arguments
- more general tuple recipe
- stephist logscale improvements
-
-## 0.25.2
- improvements to handle missings
- pyplot: allow setting the color gradient for z values
- document :colorbar_entry
- limit number of automatic bins
- fix ENV['PLOTS_DEFAULT_BACKEND']
- don't let aspect_ratio impact subplot size
- implement arrowstyle for GR
- fix bug in plotly_convert_to_datetime
- improve missing support
- gr: polar heatmaps
- make sure show returns nothing
-
-## 0.25.1
- fix gr_display
-
-## 0.25.0
- Replace StaticArrays with GeometryTypes
- Contour fixes for GR
-
-## 0.24.0
- Update to the new PyCall and PyPlot API
- fix drawing of ticks
- fix y label position with GR
-
-## 0.23.2
- pyplot fixes
- Add option :tex_output_standalone to set the 'include_preamble' argument in the PGFPlots backend.
- fix ticks
- support plotly json mime
- fix image axis limits
- default to radius 0 at center for polar plots
-
-## 0.23.1
- slightly faster load time
- fixed errant MethodError
- fix bar plots with unicodeplots
- better colorbars for contour
- add volume seriestype for GR
- fix passing a tuple to custom ticks
- add vline to pgfplots
- add tex output for pyplot
- better 3d axis labels for GR
-
-## 0.23.0
- compatible with StatPlots -> StatsPlots name shift
- fix histograms for vectors with NaN and Inf
- change gif behaviour (remove cache-busting)
- improved docstrings for shorthands functions
- fix font rotation for pyplot
- fix greyscale images for pyplot
- clamp greyscale images with values outside 0,1
- support keyword argument for font options
- allow vector of markers for pyplot scatter
-
-## 0.22.5
- improve behaviour of plotlyjs backend
-
-## 0.22.4
- Add support for discrete contourf plots with GR
-
-## 0.22.3
- Fix the `showtheme` function
-
-## 0.22.2
- Allow annotations to accept a Tuple instead of the result of a text call (making it possible to specify font characteristics in recipes). E.g. `annotations = (2, 4, ("test", :right, 8, :red))` is the same as `annotations = (2, 4, text("test", :right, 8, :red))`
-
 ## 0.22.1
 - push PlotsDisplay just after REPLDisplay

@@ -1,73 +0,0 @@
-name = "Plots"
-uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
-author = ["Tom Breloff (@tbreloff)"]
-version = "1.0.14"
-
-[deps]
-Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
-Contour = "d38c429a-6771-53c6-b99e-75d170b6e991"
-Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
-FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
-GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
-NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
-PlotThemes = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a"
-PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043"
-Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
-Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-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"
-SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
-
-[compat]
-Contour = "0.5"
-FFMPEG = "0.2, 0.3"
-FixedPointNumbers = "0.6, 0.7, 0.8"
-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 = "1"
-PlotUtils = "0.6.5"
-RecipesBase = "1"
-RecipesPipeline = "0.1.1"
-Reexport = "0.2"
-Requires = "0.5, 1"
-Showoff = "0.3.1"
-StatsBase = "0.32, 0.33"
-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"
-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"]
@@ -1,30 +1,17 @@
 # Plots

-[travis-img]: https://img.shields.io/travis/JuliaPlots/Plots.jl?logo=travis
-[travis-url]: https://travis-ci.org/JuliaPlots/Plots.jl
-
-[appveyor-img]: https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true
-[appveyor-url]: https://ci.appveyor.com/project/mkborregaard/plots-jl
-
-[pkgeval-img]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/P/Plots.svg
-[pkgeval-url]: https://juliaci.github.io/NanosoldierReports/pkgeval_badges/report.html
-
-[gitter-img]: https://badges.gitter.im/tbreloff/Plots.jl.svg
-[gitter-url]: https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-
-[docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
-[docs-url]: http://docs.juliaplots.org/latest/
-
-[![][travis-img]][travis-url]
-[![][appveyor-img]][appveyor-url]
-[![][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)
+[![Build Status](https://travis-ci.org/JuliaPlots/Plots.jl.svg?branch=master)](https://travis-ci.org/JuliaPlots/Plots.jl)
+[![Build status](https://ci.appveyor.com/api/projects/status/github/juliaplots/plots.jl?branch=master&svg=true)](https://ci.appveyor.com/project/mkborregaard/plots-jl)
+[![Join the chat at https://gitter.im/tbreloff/Plots.jl](https://badges.gitter.im/tbreloff/Plots.jl.svg)](https://gitter.im/tbreloff/Plots.jl?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+<a href="http://docs.juliaplots.org/latest/" target="_blank"><img src="https://img.shields.io/badge/docs-latest-blue.svg" alt="Latest documentation"></a>
+<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.3.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.3) -->
+<!-- [![Plots](http://pkg.julialang.org/badges/Plots_0.4.svg)](http://pkg.julialang.org/?pkg=Plots&ver=0.4) -->
+<!-- [![Coverage Status](https://coveralls.io/repos/tbreloff/Plots.jl/badge.svg?branch=master)](https://coveralls.io/r/tbreloff/Plots.jl?branch=master) -->
+<!-- [![codecov.io](http://codecov.io/github/tbreloff/Plots.jl/coverage.svg?branch=master)](http://codecov.io/github/tbreloff/Plots.jl?branch=master) -->

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

-#### Maintained by the [JuliaPlots members](https://github.com/orgs/JuliaPlots/people)
+#### Maintained by the [JuliaPlot members](https://github.com/orgs/JuliaPlots/people)

 Plots is a plotting API and toolset.  My goals with the package are:

@@ -0,0 +1,16 @@
+julia 1.0
+
+RecipesBase 0.6.0
+PlotUtils 0.4.1
+PlotThemes 0.1.3
+Reexport
+StaticArrays 0.5
+FixedPointNumbers 0.3
+Measures
+Showoff
+StatsBase 0.14.0
+JSON
+NaNMath
+Requires
+Contour
+GR 0.37.0
@@ -1,6 +1,6 @@
 environment:
  matrix:
-  - julia_version: 1.0
+  # - julia_version: 0.7
  - julia_version: 1
  - julia_version: nightly

@@ -19,9 +19,6 @@ branches:
    - master
    - /release-.*/

-cache:
-  - '%USERPROFILE%\.julia\artifacts'
-
 notifications:
  - provider: Email
    on_build_success: false
@@ -32,7 +29,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"
@@ -1,53 +0,0 @@
-# To figure out what should be precompiled, run this script, then move
-# precompile_Plots.jl in precompiles_path (see below) to src/precompile.jl
-
-# This script works by using SnoopCompile to log compilations that take place
-# while running the examples on the GR backend. So SnoopCompile must be
-# installed, and StatsPlots, RDatasets, and FileIO are also required for
-# certain examples.
-
-# If precompilation fails with an UndefVarError for a module, probably what is
-# happening is that the module appears in the precompile statements, but is
-# only visible to one of Plots' dependencies, and not Plots itself. Adding the
-# module to the blacklist below will remove these precompile statements.
-
-# Anonymous functions may appear in precompile statements as functions with
-# hashes in their name. Those of the form "#something##kw" have to do with
-# compiling functions with keyword arguments, and are named reproducibly, so
-# can be kept. Others generally will not work. Currently, SnoopCompile includes
-# some anonymous functions that not reproducible, but SnoopCompile PR #30
-# (which looks about to be merged) will ensure that anonymous functions are
-# actually defined before attempting to precompile them. Alternatively, we can
-# keep only the keyword argument related anonymous functions by changing the
-# regex that SnoopCompile uses to detect anonymous functions to
-# r"#{1,2}[^\"#]+#{1,2}\d+" (see anonrex in SnoopCompile.jl). To exclude all
-# precompile statements involving anonymous functions, "#" can also be added to
-# the blacklist below.
-
-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
-    using Plots
-    Plots.test_examples(:gr)
-    Plots.test_examples(:plotly, skip = Plots._backend_skips[:plotly])
-end
-
-# precompile calls containing the following strings are dropped
-blacklist = [
-    # functions defined in examples
-    "PlotExampleModule",
-    # the following are not visible to Plots, only its dependencies
-    "CategoricalArrays",
-    "FixedPointNumbers",
-    "SparseArrays",
-    r"#{1,2}[^\"#]+#{1,2}\d+",
-]
-
-data = SnoopCompile.read(log_path)
-pc = SnoopCompile.parcel(reverse!(data[2]), blacklist=blacklist)
-SnoopCompile.write(precompiles_path, pc)
@@ -0,0 +1,4 @@
+git checkout master
+git merge --ff-only dev
+git push origin master
+git checkout dev
@@ -1,21 +1,15 @@
 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])
+_current_plots_version = v"0.20.6"

 using Reexport

-import GeometryTypes
+import StaticArrays
 using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
 import SparseArrays: findnz

-using FFMPEG
-
@reexport using RecipesBase
-import RecipesBase: plot, plot!, animate, is_explicit
+import RecipesBase: plot, plot!, animate
 using Base.Meta
@reexport using PlotUtils
@reexport using PlotThemes
@@ -167,26 +161,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 +169,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")
@@ -212,7 +187,7 @@ include("backends/plotly.jl")
 include("backends/gr.jl")
 include("backends/web.jl")

-include("shorthands.jl")
+include("shorthands.jl") 

 let PlotOrSubplot = Union{Plot, Subplot}
    global title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
@@ -245,7 +220,4 @@ end

 const CURRENT_BACKEND = CurrentBackend(:none)

-include("precompile.jl")
-_precompile_()
-
 end # module
@@ -60,43 +60,31 @@ end

 file_extension(fn) = Base.Filesystem.splitext(fn)[2][2:end]

-gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim, fn; kw...)
-mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim, fn, false; kw...)
-mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim, fn, false; kw...)
+gif(anim::Animation, fn = giffn(); kw...) = buildanimation(anim.dir, fn; kw...)
+mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim.dir, fn, false; kw...)
+mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim.dir, fn, false; kw...)

-ffmpeg_framerate(fps) = "$fps"
-ffmpeg_framerate(fps::Rational) = "$(fps.num)/$(fps.den)"

-function buildanimation(anim::Animation, fn::AbstractString,
+function buildanimation(animdir::AbstractString, fn::AbstractString,
                        is_animated_gif::Bool=true;
-                        fps::Real = 20, loop::Integer = 0,
+                        fps::Integer = 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"))
-    end
-
-    fn = abspath(expanduser(fn))
-    animdir = anim.dir
-    framerate = ffmpeg_framerate(fps)
-    verbose_level = (verbose isa Int ? verbose :
-                        verbose ? 32  # "info"
-                                : 16) # "error"
+    fn = abspath(fn)

    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`)
+            run(`ffmpeg -v 0 -framerate $fps -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"`)
+            run(`ffmpeg -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`)
+            run(`ffmpeg -v 0 -framerate $fps -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`)
+        run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
    end

    show_msg && @info("Saved animation to ", fn)
@@ -108,27 +96,13 @@ end
 # write out html to view the gif
 function Base.show(io::IO, ::MIME"text/html", agif::AnimatedGif)
    ext = file_extension(agif.filename)
-    if ext == "gif"
-        html = "<img src=\"data:image/gif;base64," * base64encode(read(agif.filename)) * "\" />"
+    write(io, if ext == "gif"
+        "<img src=\"$(relpath(agif.filename))\" />"
    elseif ext in ("mov", "mp4")
-        mimetype = ext == "mov" ? "video/quicktime" : "video/mp4"
-        html = "<video controls><source src=\"data:$mimetype;base64," *
-               base64encode(read(agif.filename)) *
-               "\" type = \"$mimetype\"></video>"
+        "<video controls><source src=\"$(relpath(agif.filename)) type=\"video/$ext\"></video>"
    else
        error("Cannot show animation with extension $ext: $agif")
-    end
-
-    write(io, html)
-    return nothing
-end
-
-
-# Only gifs can be shown via image/gif
-Base.showable(::MIME"image/gif", agif::AnimatedGif) = file_extension(agif.filename) == "gif"
-
-function Base.show(io::IO, ::MIME"image/gif", agif::AnimatedGif)
-    open(fio-> write(io, fio), agif.filename)
+    end)
 end


@@ -167,16 +141,16 @@ function _animate(forloop::Expr, args...; callgif = false)
    error("Unsupported animate filter: $args")
  end

-  push!(block.args, :(if $filterexpr; Plots.frame($animsym); end))
+  push!(block.args, :(if $filterexpr; frame($animsym); end))
  push!(block.args, :(global $countersym += 1))

  # add a final call to `gif(anim)`?
-  retval = callgif ? :(Plots.gif($animsym)) : animsym
+  retval = callgif ? :(gif($animsym)) : animsym

  # full expression:
  esc(quote
    $freqassert             # if filtering, check frequency is an Integer > 0
-    $animsym = Plots.Animation()  # init animation object
+    $animsym = Animation()  # init animation object
    global $countersym = 1         # init iteration counter
    $forloop                # for loop, saving a frame after each iteration
    $retval                 # return the animation object, or the gif
@@ -42,7 +42,6 @@ const _arg_desc = KW(
 :arrow             	=> "nothing (no arrows), Bool (if true, default arrows), Arrow object, or arg(s) that could be style or head length/widths.  Defines arrowheads that should be displayed at the end of path line segments (just before a NaN and the last non-NaN point).  Used in quiverplot, streamplot, or similar.",
 :normalize         	=> "Bool or Symbol. Histogram normalization mode. Possible values are: false/:none (no normalization, default), true/:pdf (normalize to a discrete Probability Density Function, where the total area of the bins is 1), :probability (bin heights sum to 1) and :density (the area of each bin, rather than the height, is equal to the counts - useful for uneven bin sizes).",
 :weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
-:show_empty_bins    => "Bool. Whether empty bins in a 2D histogram are colored as 0 (true), or transparent (the default).",
 :contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
 :contour_labels         => "Bool. Show labels at the contour lines?",
 :match_dimensions  	=> "Bool. For heatmap types... should the first dimension of a matrix (rows) correspond to the first dimension of the plot (x-axis)?  The default is false, which matches the behavior of Matplotlib, Plotly, and others.  Note: when passing a function for z, the function should still map `(x,y) -> z`.",
@@ -50,7 +49,6 @@ const _arg_desc = KW(
 :series_annotations     => "AbstractVector of String or PlotText.  These are annotations which are mapped to data points/positions.",
 :primary                => "Bool.  Does this count as a 'real series'?  For example, you could have a path (primary), and a scatter (secondary) as 2 separate series, maybe with different data (see sticks recipe for an example).  The secondary series will get the same color, etc as the primary.",
 :hover 	        	=> "nothing or vector of strings. Text to display when hovering over each data point.",
-:colorbar_entry   => "Bool.  Include this series in the color bar?  Set to `false` to exclude.",

 # plot args
 :plot_title               => "String. Title for the whole plot (not the subplots) (Note: Not currently implemented)",
@@ -65,7 +63,6 @@ const _arg_desc = KW(
 :link                     => "Symbol.  How/whether to link axis limits between subplots. Values: `:none`, `:x` (x axes are linked by columns), `:y` (y axes are linked by rows), `:both` (x and y are linked), `:all` (every subplot is linked together regardless of layout position).",
 :overwrite_figure         => "Bool.  Should we reuse the same GUI window/figure when plotting (true) or open a new one (false).",
 :html_output_format       => "Symbol.  When writing html output, what is the format?  `:png` and `:svg` are currently supported.",
-:tex_output_standalone    => "Bool. When writing tex output, should the source include a preamble for a standalone document class.",
 :inset_subplots           => "nothing or vector of 2-tuple (parent,bbox).  optionally pass a vector of (parent,bbox) tuples which are the parent layout and the relative bounding box of inset subplots",
 :dpi 			  => "Number.  Dots Per Inch of output figures",
 :thickness_scaling        => "Number. Scale for the thickness of all line elements like lines, borders, axes, grid lines, ... defaults to 1.",
@@ -89,23 +86,16 @@ 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 Symbol (legend position).  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",
 :legendfontvalign         => "Symbol. Font vertical alignment of legend entries: :vcenter, :top, :bottom or :center",
 :legendfontrotation       => "Real. Font rotation of legend entries",
 :legendfontcolor          => "Color Type. Font color of legend entries",
-:legendtitlefontfamily    => "String or Symbol. Font family of the legend title.",
-:legendtitlefontsize           => "Integer. Font pointsize the legend title.",
-:legendtitlefonthalign         => "Symbol. Font horizontal alignment of the legend title: :hcenter, :left, :right or :center",
-:legendtitlefontvalign         => "Symbol. Font vertical alignment of the legend title: :vcenter, :top, :bottom or :center",
-:legendtitlefontrotation       => "Real. Font rotation of the legend title",
-:legendtitlefontcolor          => "Color Type. Font color of the legend title",
 :colorbar                 => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
 :clims 					  => "`:auto` or NTuple{2,Number}.  Fixes the limits of the colorbar.",
 :legendfont               => "Font. Font of legend items.",
-:legendtitlefont          => "Font. Font of the legend title.",
 :annotations              => "(x,y,text) tuple(s).  Can be a single tuple or a list of them.  Text can be String or PlotText (created with `text(args...)`)  Add one-off text annotations at the x,y coordinates.",
 :projection               => "Symbol or String.  '3d' or 'polar'",
 :aspect_ratio             => "Symbol (:equal) or Number. Plot area is resized so that 1 y-unit is the same size as `aspect_ratio` x-units.",
@@ -159,5 +149,4 @@ const _arg_desc = KW(
 :tick_direction           => "Symbol.  Direction of the ticks. `:in` or `:out`",
 :showaxis                 => "Bool, Symbol or String.  Show the axis. `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:off`",
 :widen                    => "Bool. Widen the axis limits by a small factor to avoid cut-off markers and lines at the borders. Defaults to `true`.",
-:draw_arrow               => "Bool. Draw arrow at the end of the axis.",
 )
@@ -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::KW) = 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])

@@ -229,7 +232,6 @@ const _bar_width = 0.8

 const _series_defaults = KW(
    :label             => "AUTO",
-    :colorbar_entry    => true,
    :seriescolor       => :auto,
    :seriesalpha       => nothing,
    :seriestype        => :path,
@@ -264,13 +266,11 @@ 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...)`
    :normalize         => false,     # do we want a normalized histogram?
    :weights           => nothing,   # optional weights for histograms (1D and 2D)
-    :show_empty_bins   => false,     # should empty bins in 2D histogram be colored as zero (otherwise they are transparent)
    :contours          => false,     # add contours to 3d surface and wireframe plots
    :contour_labels    => false,
    :match_dimensions  => false,     # do rows match x (true) or y (false) for heatmap/image/spy? see issue 196
@@ -298,7 +298,6 @@ const _plot_defaults = KW(
    :link                        => :none,
    :overwrite_figure            => true,
    :html_output_format          => :auto,
-    :tex_output_standalone       => false,
    :inset_subplots              => nothing,   # optionally pass a vector of (parent,bbox) tuples which are
                                               # the parent layout and the relative bounding box of inset subplots
    :dpi                         => DPI,        # dots per inch for images, etc
@@ -335,15 +334,9 @@ const _subplot_defaults = KW(
    :legendfontvalign         => :vcenter,
    :legendfontrotation       => 0.0,
    :legendfontcolor          => :match,
-    :legendtitlefontfamily    => :match,
-    :legendtitlefontsize      => 11,
-    :legendtitlefonthalign    => :hcenter,
-    :legendtitlefontvalign    => :vcenter,
-    :legendtitlefontrotation  => 0.0,
-    :legendtitlefontcolor     => :match,
    :annotations              => [],                # annotation tuples... list of (x,y,annotation)
    :projection               => :none,             # can also be :polar or :3d
-    :aspect_ratio             => :auto,             # choose from :none or :equal
+    :aspect_ratio             => :none,             # choose from :none or :equal
    :margin                   => 1mm,
    :left_margin              => :match,
    :top_margin               => :match,
@@ -397,7 +390,6 @@ const _axis_defaults = KW(
    :minorgrid                => false,
    :showaxis                 => true,
    :widen                    => true,
-    :draw_arrow               => false,
 )

 const _suppress_warnings = Set{Symbol}([
@@ -416,26 +408,37 @@ const _suppress_warnings = Set{Symbol}([

 # add defaults for the letter versions
 const _axis_defaults_byletter = KW()
+for letter in (:x,:y,:z)
+    for k in keys(_axis_defaults)
+    # for k in (
+    #             :guide,
+    #             :lims,
+    #             :ticks,
+    #             :scale,
+    #             :rotation,
+    #             :flip,
+    #             :link,
+    #             :tickfont,
+    #             :guidefont,
+    #             :foreground_color_axis,
+    #             :foreground_color_border,
+    #             :foreground_color_text,
+    #             :foreground_color_guide,
+    #             :discrete_values,
+    #             :formatter,
+    #         )
+        _axis_defaults_byletter[Symbol(letter,k)] = :match

-function reset_axis_defaults_byletter!()
-    for letter in (:x,:y,:z)
-        _axis_defaults_byletter[letter] = KW()
-        for (k,v) in _axis_defaults
-            _axis_defaults_byletter[letter][k] = v
-        end
+        # allow the underscore version too: xguide or x_guide
+        add_aliases(Symbol(letter, k), Symbol(letter, "_", k))
    end
 end
-reset_axis_defaults_byletter!()
-
-for letter in (:x,:y,:z), k in keys(_axis_defaults)
-    # allow the underscore version too: xguide or x_guide
-    add_aliases(Symbol(letter, k), Symbol(letter, "_", k))
-end

 const _all_defaults = KW[
    _series_defaults,
    _plot_defaults,
-    _subplot_defaults
+    _subplot_defaults,
+    _axis_defaults_byletter
 ]

 const _initial_defaults = deepcopy(_all_defaults)
@@ -444,37 +447,12 @@ const _initial_axis_defaults = deepcopy(_axis_defaults)
 # to be able to reset font sizes to initial values
 const _initial_fontsizes = Dict(:titlefontsize  => _subplot_defaults[:titlefontsize],
                                :legendfontsize => _subplot_defaults[:legendfontsize],
-                                :legendtitlefontsize => _subplot_defaults[:legendtitlefontsize],
                                :tickfontsize   => _axis_defaults[:tickfontsize],
                                :guidefontsize  => _axis_defaults[:guidefontsize])

-const _internal_args =
-    [:plot_object, :series_plotindex, :markershape_to_add, :letter, :idxfilter]
-
-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
+const _all_args = sort(collect(union(map(keys, _all_defaults)...)))

 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)

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

@@ -486,7 +464,7 @@ 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)
+function aliasesAndAutopick(plotattributes::KW, sym::Symbol, aliases::Dict{Symbol,Symbol}, options::AVec, plotIndex::Int)
    if plotattributes[sym] == :auto
        plotattributes[sym] = autopick_ignore_none_auto(options, plotIndex)
    elseif haskey(aliases, plotattributes[sym])
@@ -566,18 +544,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)
@@ -592,10 +569,8 @@ 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)
 add_aliases(:aspect_ratio, :aspectratio, :axis_ratio, :axisratio, :ratio)
 add_aliases(:match_dimensions, :transpose, :transpose_z)
 add_aliases(:subplot, :sp, :subplt, :splt)
@@ -624,16 +599,6 @@ end

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

-function parse_axis_kw(s::Symbol)
-    s = string(s)
-    for letter in ('x', 'y', 'z')
-        if startswith(s, letter)
-            return (Symbol(letter), Symbol(chop(s, head=1, tail=0)))
-        end
-    end
-    return nothing
-end
-
 # update the defaults globally

 """
@@ -652,11 +617,6 @@ function default(k::Symbol)
    if haskey(_axis_defaults, k)
        return _axis_defaults[k]
    end
-    if (axis_k = parse_axis_kw(k)) !== nothing
-        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

@@ -672,40 +632,30 @@ function default(k::Symbol, v)
        _axis_defaults[k] = v
        return v
    end
-    if (axis_k = parse_axis_kw(k)) !== nothing
-        letter, key = axis_k
-        _axis_defaults_byletter[letter][key] = v
-        return v
-    end
    k in _suppress_warnings || error("Unknown key: ", k)
 end

 function default(; kw...)
-    if isempty(kw)
-        reset_defaults()
-    else
-        kw = KW(kw)
-        RecipesPipeline.preprocess_attributes!(kw)
-        for (k,v) in kw
-            default(k, v)
-        end
+    kw = KW(kw)
+    preprocessArgs!(kw)
+    for (k,v) in kw
+        default(k, v)
    end
 end

-function default(plotattributes::AKW, k::Symbol)
+function default(plotattributes::KW, k::Symbol)
    get(plotattributes, k, default(k))
 end

 function reset_defaults()
    foreach(merge!, _all_defaults, _initial_defaults)
    merge!(_axis_defaults, _initial_axis_defaults)
-    reset_axis_defaults_byletter!()
 end

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

 # if arg is a valid color value, then set plotattributes[csym] and return true
-function handleColors!(plotattributes::AKW, arg, csym::Symbol)
+function handleColors!(plotattributes::KW, arg, csym::Symbol)
    try
        if arg == :auto
            plotattributes[csym] = :auto
@@ -722,7 +672,7 @@ end



-function processLineArg(plotattributes::AKW, arg)
+function processLineArg(plotattributes::KW, arg)
    # seriestype
    if allLineTypes(arg)
        plotattributes[:seriestype] = arg
@@ -732,15 +682,15 @@ function processLineArg(plotattributes::AKW, arg)
        plotattributes[:linestyle] = arg

    elseif typeof(arg) <: Stroke
-        arg.width === nothing || (plotattributes[:linewidth] = arg.width)
-        arg.color === nothing || (plotattributes[:linecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[:linealpha] = arg.alpha)
-        arg.style === nothing || (plotattributes[:linestyle] = arg.style)
+        arg.width == nothing || (plotattributes[:linewidth] = arg.width)
+        arg.color == nothing || (plotattributes[:linecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[:linealpha] = arg.alpha)
+        arg.style == nothing || (plotattributes[:linestyle] = arg.style)

    elseif typeof(arg) <: Brush
-        arg.size  === nothing || (plotattributes[:fillrange] = arg.size)
-        arg.color === nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[:fillalpha] = arg.alpha)
+        arg.size  == nothing || (plotattributes[:fillrange] = arg.size)
+        arg.color == nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[:fillalpha] = arg.alpha)

    elseif typeof(arg) <: Arrow || arg in (:arrow, :arrows)
        plotattributes[:arrow] = arg
@@ -761,7 +711,7 @@ function processLineArg(plotattributes::AKW, arg)
 end


-function processMarkerArg(plotattributes::AKW, arg)
+function processMarkerArg(plotattributes::KW, arg)
    # markershape
    if allShapes(arg)
        plotattributes[:markershape] = arg
@@ -771,24 +721,20 @@ function processMarkerArg(plotattributes::AKW, arg)
        plotattributes[:markerstrokestyle] = arg

    elseif typeof(arg) <: Stroke
-        arg.width === nothing || (plotattributes[:markerstrokewidth] = arg.width)
-        arg.color === nothing || (plotattributes[:markerstrokecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[:markerstrokealpha] = arg.alpha)
-        arg.style === nothing || (plotattributes[:markerstrokestyle] = arg.style)
+        arg.width == nothing || (plotattributes[:markerstrokewidth] = arg.width)
+        arg.color == nothing || (plotattributes[:markerstrokecolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[:markerstrokealpha] = arg.alpha)
+        arg.style == nothing || (plotattributes[:markerstrokestyle] = arg.style)

    elseif typeof(arg) <: Brush
-        arg.size  === nothing || (plotattributes[:markersize]  = arg.size)
-        arg.color === nothing || (plotattributes[:markercolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[:markeralpha] = arg.alpha)
+        arg.size  == nothing || (plotattributes[:markersize]  = arg.size)
+        arg.color == nothing || (plotattributes[:markercolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[:markeralpha] = arg.alpha)

    # linealpha
    elseif allAlphas(arg)
        plotattributes[:markeralpha] = arg

-    # bool
-    elseif typeof(arg) <: Bool
-        plotattributes[:markershape] = arg ? :circle : :none
-
    # markersize
    elseif allReals(arg)
        plotattributes[:markersize] = arg
@@ -801,12 +747,12 @@ function processMarkerArg(plotattributes::AKW, arg)
 end


-function processFillArg(plotattributes::AKW, arg)
+function processFillArg(plotattributes::KW, arg)
    # fr = get(plotattributes, :fillrange, 0)
    if typeof(arg) <: Brush
-        arg.size  === nothing || (plotattributes[:fillrange] = arg.size)
-        arg.color === nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[:fillalpha] = arg.alpha)
+        arg.size  == nothing || (plotattributes[:fillrange] = arg.size)
+        arg.color == nothing || (plotattributes[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[:fillalpha] = arg.alpha)

    elseif typeof(arg) <: Bool
        plotattributes[:fillrange] = arg ? 0 : nothing
@@ -824,6 +770,7 @@ function processFillArg(plotattributes::AKW, arg)
        plotattributes[:fillrange] = arg

    elseif !handleColors!(plotattributes, arg, :fillcolor)
+
        plotattributes[:fillrange] = arg
    end
    # plotattributes[:fillrange] = fr
@@ -831,7 +778,7 @@ function processFillArg(plotattributes::AKW, arg)
 end


-function processGridArg!(plotattributes::AKW, arg, letter)
+function processGridArg!(plotattributes::KW, arg, letter)
    if arg in _allGridArgs || isa(arg, Bool)
        plotattributes[Symbol(letter, :grid)] = hasgrid(arg, letter)

@@ -839,10 +786,10 @@ function processGridArg!(plotattributes::AKW, arg, letter)
        plotattributes[Symbol(letter, :gridstyle)] = arg

    elseif typeof(arg) <: Stroke
-        arg.width === nothing || (plotattributes[Symbol(letter, :gridlinewidth)] = arg.width)
-        arg.color === nothing || (plotattributes[Symbol(letter, :foreground_color_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[Symbol(letter, :gridalpha)] = arg.alpha)
-        arg.style === nothing || (plotattributes[Symbol(letter, :gridstyle)] = arg.style)
+        arg.width == nothing || (plotattributes[Symbol(letter, :gridlinewidth)] = arg.width)
+        arg.color == nothing || (plotattributes[Symbol(letter, :foreground_color_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[Symbol(letter, :gridalpha)] = arg.alpha)
+        arg.style == nothing || (plotattributes[Symbol(letter, :gridstyle)] = arg.style)

    # linealpha
    elseif allAlphas(arg)
@@ -859,7 +806,7 @@ function processGridArg!(plotattributes::AKW, arg, letter)
    end
 end

-function processMinorGridArg!(plotattributes::AKW, arg, letter)
+function processMinorGridArg!(plotattributes::KW, arg, letter)
    if arg in _allGridArgs || isa(arg, Bool)
        plotattributes[Symbol(letter, :minorgrid)] = hasgrid(arg, letter)

@@ -868,10 +815,10 @@ function processMinorGridArg!(plotattributes::AKW, arg, letter)
        plotattributes[Symbol(letter, :minorgrid)] = true

    elseif typeof(arg) <: Stroke
-        arg.width === nothing || (plotattributes[Symbol(letter, :minorgridlinewidth)] = arg.width)
-        arg.color === nothing || (plotattributes[Symbol(letter, :foreground_color_minor_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
-        arg.alpha === nothing || (plotattributes[Symbol(letter, :minorgridalpha)] = arg.alpha)
-        arg.style === nothing || (plotattributes[Symbol(letter, :minorgridstyle)] = arg.style)
+        arg.width == nothing || (plotattributes[Symbol(letter, :minorgridlinewidth)] = arg.width)
+        arg.color == nothing || (plotattributes[Symbol(letter, :foreground_color_minor_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
+        arg.alpha == nothing || (plotattributes[Symbol(letter, :minorgridalpha)] = arg.alpha)
+        arg.style == nothing || (plotattributes[Symbol(letter, :minorgridstyle)] = arg.style)
        plotattributes[Symbol(letter, :minorgrid)] = true

    # linealpha
@@ -892,7 +839,7 @@ function processMinorGridArg!(plotattributes::AKW, arg, letter)
    end
 end

-function processFontArg!(plotattributes::AKW, fontname::Symbol, arg)
+function processFontArg!(plotattributes::KW, fontname::Symbol, arg)
    T = typeof(arg)
    if T <: Font
        plotattributes[Symbol(fontname, :family)] = arg.family
@@ -929,7 +876,7 @@ _replace_markershape(shape::Symbol) = get(_markerAliases, shape, shape)
 _replace_markershape(shapes::AVec) = map(_replace_markershape, shapes)
 _replace_markershape(shape) = shape

-function _add_markershape(plotattributes::AKW)
+function _add_markershape(plotattributes::KW)
    # add the markershape if it needs to be added... hack to allow "m=10" to add a shape,
    # and still allow overriding in _apply_recipe
    ms = pop!(plotattributes, :markershape_to_add, :none)
@@ -939,11 +886,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::KW)
    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!(plotattributes, :axis, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            process_axis_arg!(plotattributes, arg, letter)
@@ -952,7 +915,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!(plotattributes, asym, ())
        if !(typeof(args) <: Axis)
            for arg in wraptuple(args)
                process_axis_arg!(plotattributes, arg, letter)
@@ -960,17 +923,8 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
        end
    end

-    # vline accesses the y argument but actually maps it to the x axis.
-    # Hence, we have to swap formatters
-    if get(plotattributes, :seriestype, :path) == :vline
-        xformatter = get(plotattributes, :xformatter, :auto)
-        yformatter = get(plotattributes, :yformatter, :auto)
-        plotattributes[:xformatter] = yformatter
-        plotattributes[:yformatter] = xformatter
-    end
-
    # handle grid args common to all axes
-    args = RecipesPipeline.pop_kw!(plotattributes, :grid, ())
+    args = pop!(plotattributes, :grid, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            processGridArg!(plotattributes, arg, letter)
@@ -979,13 +933,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!(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!(plotattributes, :minorgrid, ())
    for arg in wraptuple(args)
        for letter in (:x, :y, :z)
            processMinorGridArg!(plotattributes, arg, letter)
@@ -994,14 +948,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!(plotattributes, gridsym, ())
        for arg in wraptuple(args)
            processMinorGridArg!(plotattributes, arg, letter)
        end
    end
+    # fonts
+    for fontname in (:titlefont, :legendfont)
+        args = pop!(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!(plotattributes, fontname, ())
        for arg in wraptuple(args)
            for letter in (:x, :y, :z)
                processFontArg!(plotattributes, Symbol(letter, fontname), arg)
@@ -1011,35 +972,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!(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!(plotattributes, :line, ()))
        processLineArg(plotattributes, arg)
    end

@@ -1053,7 +994,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
        processMarkerArg(plotattributes, arg)
        anymarker = true
    end
-    RecipesPipeline.reset_kw!(plotattributes, :marker)
+    delete!(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
@@ -1067,7 +1008,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
    for arg in wraptuple(get(plotattributes, :fill, ()))
        processFillArg(plotattributes, arg)
    end
-    RecipesPipeline.reset_kw!(plotattributes, :fill)
+    delete!(plotattributes, :fill)

    # handle series annotations
    if haskey(plotattributes, :series_annotations)
@@ -1082,7 +1023,7 @@ function RecipesPipeline.preprocess_attributes!(plotattributes::AKW)
            arrow()
        elseif a in (false, nothing, :none)
            nothing
-        elseif !(typeof(a) <: Arrow || typeof(a) <: AbstractArray{Arrow})
+        elseif !(typeof(a) <: Arrow)
            arrow(wraptuple(a)...)
        else
            a
@@ -1116,13 +1057,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, 1:length(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([""], [1:size(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([""], [1:size(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::KW, idxfilter)
+    for s in (:x, :y, :z)
+        plotattributes[s] = filter_data(get(plotattributes, s, nothing), idxfilter)
+    end
+end
+
+function _filter_input_data!(plotattributes::KW)
+    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)
+function warnOnUnsupported_args(pkg::AbstractBackend, plotattributes::KW)
    empty!(_to_warn)
    bend = backend_name(pkg)
    already_warned = get!(_already_warned, bend, Set{Symbol}())
@@ -1146,7 +1149,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)
+function warnOnUnsupported(pkg::AbstractBackend, plotattributes::KW)
    if !is_seriestype_supported(pkg, plotattributes[:seriestype])
        @warn("seriestype $(plotattributes[:seriestype]) is unsupported with $pkg.  Choose from: $(supported_seriestypes(pkg))")
    end
@@ -1158,7 +1161,7 @@ function warn_on_unsupported(pkg::AbstractBackend, plotattributes)
    end
 end

-function warn_on_unsupported_scales(pkg::AbstractBackend, plotattributes::AKW)
+function warnOnUnsupported_scales(pkg::AbstractBackend, plotattributes::KW)
    for k in (:xscale, :yscale, :zscale, :scale)
        if haskey(plotattributes, k)
            v = plotattributes[k]
@@ -1177,7 +1180,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)
        val
    else
        error("Invalid symbol for legend: $val")
@@ -1197,26 +1200,24 @@ convertLegendValue(v::AbstractArray) = map(convertLegendValue, v)
 # anything else is returned as-is
 function slice_arg(v::AMat, idx::Int)
    c = mod1(idx, size(v,2))
-    m,n = axes(v)
-    size(v,1) == 1 ? v[first(m),n[c]] : v[:,n[c]]
+    size(v,1) == 1 ? v[1,c] : v[:,c]
 end
 slice_arg(wrapper::InputWrapper, idx) = wrapper.obj
 slice_arg(v, idx) = v


-# given an argument key (k), extract the argument value for this index,
-# and set into plotattributes[k]. Matrices are sliced by column.
-# if nothing is set (or container is empty), return the existing value.
-function slice_arg!(plotattributes_in, plotattributes_out,
-                    k::Symbol, idx::Int, remove_pair::Bool)
-    v = get(plotattributes_in, k, plotattributes_out[k])
-    plotattributes_out[k] = if haskey(plotattributes_in, k) && typeof(v) <: AMat && !isempty(v)
+# given an argument key (k), we want to extract the argument value for this index.
+# matrices are sliced by column, otherwise we
+# if nothing is set (or container is empty), return the default or the existing value.
+function slice_arg!(plotattributes_in::KW,plotattributes_out::KW, k::Symbol, default_value, idx::Int, remove_pair::Bool)
+    v = get(plotattributes_in, k, get(plotattributes_out, k, default_value))
+   plotattributes_out[k] = if haskey(plotattributes_in, k) && typeof(v) <: AMat && !isempty(v)
        slice_arg(v, idx)
    else
        v
    end
    if remove_pair
-        RecipesPipeline.reset_kw!(plotattributes_in, k)
+        delete!(plotattributes_in, k)
    end
    return
 end
@@ -1225,20 +1226,26 @@ end

 # # if the value is `:match` then we take whatever match_color is.
 # # this is mainly used for cascading defaults for foreground and background colors
-# function color_or_match!(plotattributes::AKW, k::Symbol, match_color)
+# function color_or_match!(plotattributes::KW, k::Symbol, match_color)
 #     v = plotattributes[k]
 #     plotattributes[k] = if v == :match
 #         match_color
-#     elseif v === nothing
+#     elseif v == nothing
 #         plot_color(RGBA(0,0,0,0))
 #     else
 #         v
 #     end
 # end

-function color_or_nothing!(plotattributes, k::Symbol)
+function color_or_nothing!(plotattributes::KW, k::Symbol)
    v = plotattributes[k]
-    plotattributes[k] = v == :match ? v : plot_color(v)
+    plotattributes[k] = if v == nothing || v == false
+        RGBA{Float64}(0,0,0,0)
+    elseif v != :match
+        plot_color(v)
+    else
+        v
+    end
    return
 end

@@ -1257,10 +1264,8 @@ const _match_map = KW(
    :bottom_margin => :margin,
    :titlefontfamily          => :fontfamily_subplot,
    :legendfontfamily         => :fontfamily_subplot,
-    :legendtitlefontfamily    => :fontfamily_subplot,
    :titlefontcolor           => :foreground_color_subplot,
    :legendfontcolor          => :foreground_color_subplot,
-    :legendtitlefontcolor     => :foreground_color_subplot,
    :tickfontcolor            => :foreground_color_text,
    :guidefontcolor           => :foreground_color_guide,
 )
@@ -1337,18 +1342,18 @@ Base.get(series::Series, k::Symbol, v) = get(series.plotattributes, k, v)

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

-function fg_color(plotattributes::AKW)
-    fg = get(plotattributes, :foreground_color, :auto)
+function fg_color(plotattributes::KW)
+    fg = default(plotattributes, :foreground_color)
    if fg == :auto
-        bg = plot_color(get(plotattributes, :background_color, :white))
+        bg = plot_color(default(plotattributes, :background_color))
        fg = isdark(bg) ? colorant"white" : colorant"black"
    else
        plot_color(fg)
    end
 end

-function fg_color_sp(plotattributes::AKW)
-    fgsp = get(plotattributes, :foreground_color_subplot, :match)
+function fg_color_sp(plotattributes::KW)
+    fgsp = default(plotattributes, :foreground_color_subplot)
    if fg == :match
        fg_color(plotattributes)
    else
@@ -1359,13 +1364,13 @@ end


 # update attr from an input dictionary
-function _update_plot_args(plt::Plot, plotattributes_in::AKW)
+function _update_plot_args(plt::Plot, plotattributes_in::KW)
    for (k,v) in _plot_defaults
-        slice_arg!(plotattributes_in, plt.attr, k, 1, true)
+        slice_arg!(plotattributes_in, plt.attr, k, v, 1, true)
    end

    # handle colors
-    plotattributes= plt.attr
+   plotattributes= plt.attr
    plt[:background_color] = plot_color(plotattributes[:background_color])
    plt[:foreground_color] = fg_color(plotattributes)
    # bg = plot_color(plt.attr[:background_color])
@@ -1412,7 +1417,7 @@ function _update_subplot_colors(sp::Subplot)
    return
 end

-function _update_axis(plt::Plot, sp::Subplot, plotattributes_in::AKW, letter::Symbol, subplot_index::Int)
+function _update_axis(plt::Plot, sp::Subplot, plotattributes_in::KW, letter::Symbol, subplot_index::Int)
    # get (maybe initialize) the axis
    axis = get_axis(sp, letter)

@@ -1428,10 +1433,13 @@ function _update_axis(plt::Plot, sp::Subplot, plotattributes_in::AKW, letter::Sy
    return
 end

-function _update_axis(axis::Axis, plotattributes_in::AKW, letter::Symbol, subplot_index::Int)
+function _update_axis(axis::Axis, plotattributes_in::KW, 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,v) in _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)
@@ -1446,7 +1454,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

@@ -1476,12 +1484,12 @@ function _update_axis_links(plt::Plot, axis::Axis, letter::Symbol)
 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)
+function _update_subplot_args(plt::Plot, sp::Subplot, plotattributes_in::KW, subplot_index::Int, remove_pair::Bool)
+    anns = pop!(sp.attr, :annotations, [])

-    # # grab those args which apply to this subplot
-    for k in keys(_subplot_defaults)
-        slice_arg!(plotattributes_in, sp.attr, k, subplot_index, remove_pair)
+    # grab those args which apply to this subplot
+    for (k,v) in _subplot_defaults
+        slice_arg!(plotattributes_in, sp.attr, k, v, subplot_index, remove_pair)
    end

    _update_subplot_periphery(sp, anns)
@@ -1500,42 +1508,45 @@ function has_black_border_for_default(st::Symbol)
    like_histogram(st) || st in (:hexbin, :bar, :shape)
 end

-# converts a symbol or string into a Colorant or ColorGradient
-# and assigns a color automatically
-function get_series_color(c, sp::Subplot, n::Int, seriestype)
+
+# converts a symbol or string into a colorant (Colors.RGB), and assigns a color automatically
+function getSeriesRGBColor(c, sp::Subplot, n::Int)
    if c == :auto
-        c = like_surface(seriestype) ? cgrad() : autopick(sp[:color_palette], n)
+        c = autopick(sp[:color_palette], n)
    elseif isa(c, Int)
        c = autopick(sp[:color_palette], c)
    end
    plot_color(c)
 end

-function get_series_color(c::AbstractArray, sp::Subplot, n::Int, seriestype)
-    map(x->get_series_color(x, sp, n, seriestype), c)
+function getSeriesRGBColor(c::AbstractArray, sp::Subplot, n::Int)
+    map(x->getSeriesRGBColor(x, sp, n), c)
 end

-function ensure_gradient!(plotattributes::AKW, csym::Symbol, asym::Symbol)
+function ensure_gradient!(plotattributes::KW, csym::Symbol, asym::Symbol)
    if !isa(plotattributes[csym], ColorGradient)
        plotattributes[csym] = typeof(plotattributes[asym]) <: AbstractVector ? cgrad() : cgrad(alpha = plotattributes[asym])
    end
 end

-function _replace_linewidth(plotattributes::AKW)
+function _replace_linewidth(plotattributes::KW)
    # get a good default linewidth... 0 for surface and heatmaps
-    if plotattributes[:linewidth] == :auto
+    if get(plotattributes, :linewidth, :auto) == :auto
        plotattributes[:linewidth] = (get(plotattributes, :seriestype, :path) in (:surface,:heatmap,:image) ? 0 : 1)
    end
 end

-function _slice_series_args!(plotattributes::AKW, plt::Plot, sp::Subplot, commandIndex::Int)
-    for k in keys(_series_defaults)
-        haskey(plotattributes, k) && slice_arg!(plotattributes, plotattributes, k, commandIndex, false)
+function _add_defaults!(plotattributes::KW, plt::Plot, sp::Subplot, commandIndex::Int)
+    # add default values to our dictionary, being careful not to delete what we just added!
+    for (k,v) in _series_defaults
+        slice_arg!(plotattributes, plotattributes, k, v, commandIndex, false)
    end
+
    return plotattributes
 end

-function _update_series_attributes!(plotattributes::AKW, plt::Plot, sp::Subplot)
+
+function _update_series_attributes!(plotattributes::KW, plt::Plot, sp::Subplot)
    pkg = plt.backend
    globalIndex = plotattributes[:series_plotindex]
    plotIndex = _series_index(plotattributes, sp)
@@ -1545,32 +1556,30 @@ function _update_series_attributes!(plotattributes::AKW, plt::Plot, sp::Subplot)

    # update alphas
    for asym in (:linealpha, :markeralpha, :fillalpha)
-        if plotattributes[asym] === nothing
+        if plotattributes[asym] == nothing
            plotattributes[asym] = plotattributes[:seriesalpha]
        end
    end
-    if plotattributes[:markerstrokealpha] === nothing
+    if plotattributes[:markerstrokealpha] == nothing
        plotattributes[:markerstrokealpha] = plotattributes[:markeralpha]
    end

    # update series color
-    scolor = plotattributes[:seriescolor]
-    stype = plotattributes[:seriestype]
-    plotattributes[:seriescolor] = scolor = get_series_color(scolor, sp, plotIndex, stype)
+    plotattributes[:seriescolor] = getSeriesRGBColor(plotattributes[:seriescolor], sp, plotIndex)

    # update other colors
    for s in (:line, :marker, :fill)
        csym, asym = Symbol(s,:color), Symbol(s,:alpha)
        plotattributes[csym] = if plotattributes[csym] == :auto
-            plot_color(if has_black_border_for_default(stype) && s == :line
+            plot_color(if has_black_border_for_default(plotattributes[:seriestype]) && s == :line
                sp[:foreground_color_subplot]
            else
-                scolor
+                plotattributes[:seriescolor]
            end)
        elseif plotattributes[csym] == :match
-            plot_color(scolor)
+            plot_color(plotattributes[:seriescolor])
        else
-            get_series_color(plotattributes[csym], sp, plotIndex, stype)
+            getSeriesRGBColor(plotattributes[csym], sp, plotIndex)
        end
    end

@@ -1578,19 +1587,19 @@ function _update_series_attributes!(plotattributes::AKW, plt::Plot, sp::Subplot)
    plotattributes[:markerstrokecolor] = if plotattributes[:markerstrokecolor] == :match
        plot_color(sp[:foreground_color_subplot])
    elseif plotattributes[:markerstrokecolor] == :auto
-        get_series_color(plotattributes[:markercolor], sp, plotIndex, stype)
+        getSeriesRGBColor(plotattributes[:markercolor], sp, plotIndex)
    else
-        get_series_color(plotattributes[:markerstrokecolor], sp, plotIndex, stype)
+        getSeriesRGBColor(plotattributes[:markerstrokecolor], sp, plotIndex)
    end

    # if marker_z, fill_z or line_z are set, ensure we have a gradient
-    if plotattributes[:marker_z] !== nothing
+    if plotattributes[:marker_z] != nothing
        ensure_gradient!(plotattributes, :markercolor, :markeralpha)
    end
-    if plotattributes[:line_z] !== nothing
+    if plotattributes[:line_z] != nothing
        ensure_gradient!(plotattributes, :linecolor, :linealpha)
    end
-    if plotattributes[:fill_z] !== nothing
+    if plotattributes[:fill_z] != nothing
        ensure_gradient!(plotattributes, :fillcolor, :fillalpha)
    end

@@ -1605,7 +1614,6 @@ function _update_series_attributes!(plotattributes::AKW, plt::Plot, sp::Subplot)
    # set label
    label = plotattributes[:label]
    label = (label == "AUTO" ? "y$globalIndex" : label)
-    label = label in (:none, nothing, false) ? "" : label
    plotattributes[:label] = label

    _replace_linewidth(plotattributes)
@@ -7,20 +7,29 @@
 # -------------------------------------------------------------------------

 function Axis(sp::Subplot, letter::Symbol, args...; kw...)
-    explicit = KW(
+    # init with values from _plot_defaults
+    plotattributes = KW(
        :letter => letter,
+        # :extrema => (Inf, -Inf),
        :extrema => Extrema(),
        :discrete_map => Dict(),   # map discrete values to discrete indices
        :continuous_values => zeros(0),
-        :discrete_values => [],
        :use_minor => false,
        :show => true,  # show or hide the axis? (useful for linked subplots)
    )

-    attr = DefaultsDict(explicit, _axis_defaults_byletter[letter])
+    # get defaults from letter version, unless match
+    for (k,v) in _axis_defaults
+        lk = Symbol(letter, k)
+        lv = _axis_defaults_byletter[lk]
+        plotattributes[k] = (lv == :match ? v : lv)
+    end
+
+    # merge!(plotattributes, _axis_defaults)
+    plotattributes[:discrete_values] = []

    # update the defaults
-    attr!(Axis([sp], attr), args...; kw...)
+    attr!(Axis([sp], plotattributes), args...; kw...)
 end

 function get_axis(sp::Subplot, letter::Symbol)
@@ -32,7 +41,7 @@ function get_axis(sp::Subplot, letter::Symbol)
    end::Axis
 end

-function process_axis_arg!(plotattributes::AKW, arg, letter = "")
+function process_axis_arg!(plotattributes::KW, arg, letter = "")
    T = typeof(arg)
    arg = get(_scaleAliases, arg, arg)

@@ -58,7 +67,7 @@ function process_axis_arg!(plotattributes::AKW, arg, letter = "")
    elseif T <: AVec
        plotattributes[Symbol(letter,:ticks)] = arg

-    elseif arg === nothing
+    elseif arg == nothing
        plotattributes[Symbol(letter,:ticks)] = []

    elseif T <: Bool || arg in _allShowaxisArgs
@@ -84,9 +93,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)
@@ -111,25 +117,47 @@ end

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

-Base.show(io::IO, axis::Axis) = dumpdict(io, axis.plotattributes, "Axis", true)
+Base.show(io::IO, axis::Axis) = dumpdict(axis.plotattributes, "Axis", true)
 # Base.getindex(axis::Axis, k::Symbol) = getindex(axis.plotattributes, k)
 Base.setindex!(axis::Axis, v, ks::Symbol...) = setindex!(axis.plotattributes, v, ks...)
 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)
-    amin, amax = axis_limits(sp, axis[:letter])
+function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
+    amin,amax = axis_limits(axis)

    # 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
@@ -138,8 +166,8 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
    # or DateTime) is chosen based on the time span between amin and amax
    # 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 ticks == nothing && scale == :identity
+        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,13 +178,13 @@ 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

    # get a list of well-laid-out ticks
-    if ticks === nothing
+    if ticks == nothing
        scaled_ticks = optimize_ticks(
            sf(amin),
            sf(amax);
@@ -174,11 +202,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]
@@ -190,8 +218,6 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
            map(labelfunc(scale, backend()), Showoff.showoff(scaled_ticks, :plain))
        elseif formatter == :scientific
            Showoff.showoff(unscaled_ticks, :scientific)
-	elseif formatter == :latex
-	    map(x -> string("\$", replace(convert_sci_unicode(x), '×' => "\\times"), "\$"), Showoff.showoff(unscaled_ticks, :auto))
        else
            # there was an override for the formatter... use that on the unscaled ticks
            map(formatter, unscaled_ticks)
@@ -212,9 +238,9 @@ function optimal_ticks_and_labels(sp::Subplot, axis::Axis, ticks = nothing)
 end

 # return (continuous_values, discrete_values) for the ticks on this axis
-function get_ticks(sp::Subplot, axis::Axis)
+function get_ticks(axis::Axis)
    ticks = _transform_ticks(axis[:ticks])
-    ticks in (:none, nothing, false) && return nothing
+    ticks in (nothing, false) && return nothing

    # treat :native ticks as :auto
    ticks = ticks == :native ? :auto : ticks
@@ -225,7 +251,7 @@ function get_ticks(sp::Subplot, axis::Axis)
            # discrete ticks...
            n = length(dvals)
            rng = if ticks == :auto
-                Int[round(Int,i) for i in range(1, stop=n, length=min(n,15))]
+                Int[round(Int,i) for i in range(1, stop=n, length=15)]
            else # if ticks == :all
                1:n
            end
@@ -235,7 +261,7 @@ function get_ticks(sp::Subplot, axis::Axis)
            (collect(0:pi/4:7pi/4), string.(0:45:315))
        else
            # compute optimal ticks and labels
-            optimal_ticks_and_labels(sp, axis)
+            optimal_ticks_and_labels(axis)
        end
    elseif typeof(ticks) <: Union{AVec, Int}
        if !isempty(dvals) && typeof(ticks) <: Int
@@ -243,7 +269,7 @@ function get_ticks(sp::Subplot, axis::Axis)
            axis[:continuous_values][rng], dvals[rng]
        else
            # override ticks, but get the labels
-            optimal_ticks_and_labels(sp, axis, ticks)
+            optimal_ticks_and_labels(axis, ticks)
        end
    elseif typeof(ticks) <: NTuple{2, Any}
        # assuming we're passed (ticks, labels)
@@ -260,16 +286,16 @@ _transform_ticks(ticks) = ticks
 _transform_ticks(ticks::AbstractArray{T}) where T <: Dates.TimeType = Dates.value.(ticks)
 _transform_ticks(ticks::NTuple{2, Any}) = (_transform_ticks(ticks[1]), ticks[2])

-function get_minor_ticks(sp, axis, ticks)
-    axis[:minorticks] in (:none, nothing, false) && !axis[:minorgrid] && return nothing
+function get_minor_ticks(axis,ticks)
+    axis[:minorticks] in (nothing, false) && !axis[:minorgrid] && return nothing
    ticks = ticks[1]
    length(ticks) < 2 && return nothing

-    amin, amax = axis_limits(sp, axis[:letter])
+    amin, amax = axis_limits(axis)
    #Add one phantom tick either side of the ticks to ensure minor ticks extend to the axis limits
    if length(ticks) > 2
        ratio = (ticks[3] - ticks[2])/(ticks[2] - ticks[1])
-    elseif axis[:scale] in (:none, :identity)
+    elseif axis[:scale] == :none
        ratio = 1
    else
        return nothing
@@ -283,9 +309,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
-            append!(minorticks,collect(lo + (hi-lo)/n :(hi-lo)/n: hi - (hi-lo)/2n))
-        end
+        append!(minorticks,collect(lo + (hi-lo)/n :(hi-lo)/n: hi - (hi-lo)/2n))
    end
    minorticks[amin .<= minorticks .<= amax]
 end
@@ -333,7 +357,7 @@ function expand_extrema!(axis::Axis, v::AVec{N}) where N<:Number
 end


-function expand_extrema!(sp::Subplot, plotattributes::AKW)
+function expand_extrema!(sp::Subplot, plotattributes::KW)
    vert = isvertical(plotattributes)

    # first expand for the data
@@ -358,7 +382,7 @@ function expand_extrema!(sp::Subplot, plotattributes::AKW)
                data = plotattributes[letter] = Surface(Matrix{Float64}(data.surf))
            end
            expand_extrema!(axis, data)
-        elseif data !== nothing
+        elseif data != nothing
            # TODO: need more here... gotta track the discrete reference value
            #       as well as any coord offset (think of boxplot shape coords... they all
            #       correspond to the same x-value)
@@ -375,10 +399,10 @@ function expand_extrema!(sp::Subplot, plotattributes::AKW)

    # expand for fillrange
    fr = plotattributes[:fillrange]
-    if fr === nothing && plotattributes[:seriestype] == :bar
+    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
@@ -395,7 +419,7 @@ function expand_extrema!(sp::Subplot, plotattributes::AKW)
        data = plotattributes[dsym]

        bw = plotattributes[:bar_width]
-        if bw === nothing
+        if bw == nothing
            bw = plotattributes[:bar_width] = _bar_width * ignorenan_minimum(filter(x->x>0,diff(sort(data))))
        end
        axis = sp.attr[Symbol(dsym, :axis)]
@@ -423,7 +447,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)
@@ -455,19 +479,16 @@ function round_limits(amin,amax)
 end

 # using the axis extrema and limit overrides, return the min/max value for this axis
-function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(letter, :axis)]), consider_aspect = true)
-    axis = sp[Symbol(letter, :axis)]
+function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis))
    ex = axis[:extrema]
    amin, amax = ex.emin, ex.emax
    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 (isa(lims, Tuple) || isa(lims, AVec)) && length(lims) == 2
+        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)
@@ -476,12 +497,12 @@ function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(l
    if !isfinite(amin) && !isfinite(amax)
        amin, amax = 0.0, 1.0
    end
-    amin, amax = if ispolar(axis.sps[1])
+    if ispolar(axis.sps[1])
        if axis[:letter] == :x
            amin, amax = 0, 2pi
        elseif lims == :auto
            #widen max radius so ticks dont overlap with theta axis
-            0, amax + 0.1 * abs(amax - amin)
+            amin, amax + 0.1 * abs(amax - amin)
        else
            amin, amax
        end
@@ -492,32 +513,6 @@ function axis_limits(sp, letter, should_widen = default_should_widen(sp[Symbol(l
    else
        amin, amax
    end
-
-    if !has_user_lims && consider_aspect && letter in (:x, :y) && !(sp[:aspect_ratio] in (:none, :auto) || RecipesPipeline.is3d(:sp))
-        aspect_ratio = isa(sp[:aspect_ratio], Number) ? sp[:aspect_ratio] : 1
-        plot_ratio = height(plotarea(sp)) / width(plotarea(sp))
-        dist = amax - amin
-
-        if letter == :x
-            yamin, yamax = axis_limits(sp, :y, default_should_widen(sp[:yaxis]), false)
-            ydist = yamax - yamin
-            axis_ratio = aspect_ratio * ydist / dist
-            factor = axis_ratio / plot_ratio
-        else
-            xamin, xamax = axis_limits(sp, :x, default_should_widen(sp[:xaxis]), false)
-            xdist = xamax - xamin
-            axis_ratio = aspect_ratio * dist / xdist
-            factor = plot_ratio / axis_ratio
-        end
-
-        if factor > 1
-            center = (amin + amax) / 2
-            amin = center + factor * (amin - center)
-            amax = center + factor * (amax - center)
-        end
-    end
-
-    return amin, amax
 end

 # -------------------------------------------------------------------------
@@ -550,10 +545,10 @@ end

 # add the discrete value for each item.  return the continuous values and the indices
 function discrete_value!(axis::Axis, v::AVec)
-    n = eachindex(v)
-    cvec = zeros(axes(v))
-    discrete_indices = similar(Array{Int}, axes(v))
-    for i in n
+    n = length(v)
+    cvec = zeros(n)
+    discrete_indices = zeros(Int, n)
+    for i=1:n
        cvec[i], discrete_indices[i] = discrete_value!(axis, v[i])
    end
    cvec, discrete_indices
@@ -561,10 +556,10 @@ end

 # add the discrete value for each item.  return the continuous values and the indices
 function discrete_value!(axis::Axis, v::AMat)
-    n,m = axes(v)
-    cmat = zeros(axes(v))
-    discrete_indices = similar(Array{Int}, axes(v))
-    for i in n, j in m
+    n,m = size(v)
+    cmat = zeros(n,m)
+    discrete_indices = zeros(Int, n, m)
+    for i=1:n, j=1:m
        cmat[i,j], discrete_indices[i,j] = discrete_value!(axis, v[i,j])
    end
    cmat, discrete_indices
@@ -591,12 +586,12 @@ end
 # compute the line segments which should be drawn for this axis
 function axis_drawing_info(sp::Subplot)
    xaxis, yaxis = sp[:xaxis], sp[:yaxis]
-    xmin, xmax = axis_limits(sp, :x)
-    ymin, ymax = axis_limits(sp, :y)
-    xticks = get_ticks(sp, xaxis)
-    yticks = get_ticks(sp, yaxis)
-    xminorticks = get_minor_ticks(sp, xaxis, xticks)
-    yminorticks = get_minor_ticks(sp, yaxis, yticks)
+    xmin, xmax = axis_limits(xaxis)
+    ymin, ymax = axis_limits(yaxis)
+    xticks = get_ticks(xaxis)
+    yticks = get_ticks(yaxis)
+    xminorticks = get_minor_ticks(xaxis,xticks)
+    yminorticks = get_minor_ticks(yaxis,yticks)
    xaxis_segs = Segments(2)
    yaxis_segs = Segments(2)
    xtick_segs = Segments(2)
@@ -610,370 +605,126 @@ function axis_drawing_info(sp::Subplot)

    if sp[:framestyle] != :none
        # xaxis
-        y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
-        end
        if xaxis[:showaxis]
            if sp[:framestyle] != :grid
+                y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
+                    0.0, 0.0
+                else
+                    xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
+                end
                push!(xaxis_segs, (xmin, y1), (xmax, y1))
                # don't show the 0 tick label for the origin framestyle
-                if sp[:framestyle] == :origin && !(xticks in (:none, nothing, false)) && length(xticks) > 1
+                if sp[:framestyle] == :origin && !(xticks in (nothing,false)) && length(xticks) > 1
                    showticks = xticks[1] .!= 0
                    xticks = (xticks[1][showticks], xticks[2][showticks])
                end
            end
            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])
-            tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
-                (-t, t)
-            else
-                ticks_in = xaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(y1) + 0.012 * (f(y2) - f(y1)) * ticks_in)
-                (y1, t)
-            end
+        if !(xaxis[:ticks] in (nothing, false))
+            f = scalefunc(yaxis[:scale])
+            invf = invscalefunc(yaxis[:scale])
+            ticks_in = xaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(ymin) + 0.015 * (f(ymax) - f(ymin)) * ticks_in)
+            t2 = invf(f(ymax) - 0.015 * (f(ymax) - f(ymin)) * ticks_in)
+            t3 = invf(f(0) + 0.015 * (f(ymax) - f(ymin)) * ticks_in)

            for xtick in xticks[1]
                if xaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, t2) : (ymin, t1)
+                    end
                    push!(xtick_segs, (xtick, tick_start), (xtick, tick_stop)) # bottom tick
                end
+                # sp[:draw_axes_border] && push!(xaxis_segs, (xtick, ymax), (xtick, t2)) # top tick
                xaxis[:grid] && push!(xgrid_segs, (xtick, ymin), (xtick, ymax)) # vertical grid
            end
+        end
+        if !(xaxis[:minorticks] in (nothing, false)) || xaxis[:minorgrid]
+            f = scalefunc(yaxis[:scale])
+            invf = invscalefunc(yaxis[:scale])
+            ticks_in = xaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(ymin) + 0.01 * (f(ymax) - f(ymin)) * ticks_in)
+            t2 = invf(f(ymax) - 0.01 * (f(ymax) - f(ymin)) * ticks_in)
+            t3 = invf(f(0) + 0.01 * (f(ymax) - f(ymin)) * ticks_in)

-            if !(xaxis[:minorticks] in (:none, nothing, false)) || xaxis[:minorgrid]
-                tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(ymax) - f(ymin)))
-                    (-t, t)
-                else
-                    t = invf(f(y1) + 0.006 * (f(y2) - f(y1)) * ticks_in)
-                    (y1, t)
-                end
-                for xtick in xminorticks
-                    if xaxis[:showaxis]
-                        push!(xtick_segs, (xtick, tick_start), (xtick, tick_stop)) # bottom tick
+            for xminortick in xminorticks
+                if xaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, t2) : (ymin, t1)
                    end
-                    xaxis[:minorgrid] && push!(xminorgrid_segs, (xtick, ymin), (xtick, ymax)) # vertical grid
+                    push!(xtick_segs, (xminortick, tick_start), (xminortick, tick_stop)) # bottom tick
                end
+                # sp[:draw_axes_border] && push!(xaxis_segs, (xtick, ymax), (xtick, t2)) # top tick
+                xaxis[:minorgrid] && push!(xminorgrid_segs, (xminortick, ymin), (xminortick, ymax)) # vertical grid
            end
        end


        # yaxis
-        x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, xmin) : (xmin, xmax)
-        end
        if yaxis[:showaxis]
            if sp[:framestyle] != :grid
+                x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
+                    0.0, 0.0
+                else
+                    xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, xmin) : (xmin, xmax)
+                end
                push!(yaxis_segs, (x1, ymin), (x1, ymax))
                # don't show the 0 tick label for the origin framestyle
-                if sp[:framestyle] == :origin && !(yticks in (:none, nothing,false)) && length(yticks) > 1
+                if sp[:framestyle] == :origin && !(yticks in (nothing,false)) && length(yticks) > 1
                    showticks = yticks[1] .!= 0
                    yticks = (yticks[1][showticks], yticks[2][showticks])
                end
            end
            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])
-            tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(xmax) - f(xmin)))
-                (-t, t)
-            else
-                ticks_in = yaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(x1) + 0.012 * (f(x2) - f(x1)) * ticks_in)
-                (x1, t)
-            end
+        if !(yaxis[:ticks] in (nothing, false))
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
+            ticks_in = yaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(xmin) + 0.015 * (f(xmax) - f(xmin)) * ticks_in)
+            t2 = invf(f(xmax) - 0.015 * (f(xmax) - f(xmin)) * ticks_in)
+            t3 = invf(f(0) + 0.015 * (f(xmax) - f(xmin)) * ticks_in)

            for ytick in yticks[1]
                if yaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, t2) : (xmin, t1)
+                    end
                    push!(ytick_segs, (tick_start, ytick), (tick_stop, ytick)) # left tick
                end
+                # sp[:draw_axes_border] && push!(yaxis_segs, (xmax, ytick), (t2, ytick)) # right tick
                yaxis[:grid] && push!(ygrid_segs, (xmin, ytick), (xmax, ytick)) # horizontal grid
            end
+        end
+        if !(yaxis[:minorticks] in (nothing, false)) || yaxis[:minorgrid]
+            f = scalefunc(xaxis[:scale])
+            invf = invscalefunc(xaxis[:scale])
+            ticks_in = yaxis[:tick_direction] == :out ? -1 : 1
+            t1 = invf(f(xmin) + 0.01 * (f(xmax) - f(xmin)) * ticks_in)
+            t2 = invf(f(xmax) - 0.01 * (f(xmax) - f(xmin)) * ticks_in)
+            t3 = invf(f(0) + 0.01 * (f(xmax) - f(xmin)) * ticks_in)

-            if !(yaxis[:minorticks] in (:none, nothing, false)) || yaxis[:minorgrid]
-                tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(xmax) - f(xmin)))
-                    (-t, t)
-                else
-                    t = invf(f(x1) + 0.006 * (f(x2) - f(x1)) * ticks_in)
-                    (x1, t)
-                end
-                for ytick in yminorticks
-                    if yaxis[:showaxis]
-                        push!(ytick_segs, (tick_start, ytick), (tick_stop, ytick)) # left tick
+            for ytick in yminorticks
+                if yaxis[:showaxis]
+                    tick_start, tick_stop = if sp[:framestyle] == :origin
+                        (0, t3)
+                    else
+                        xor(yaxis[:mirror], xaxis[:flip]) ? (xmax, t2) : (xmin, t1)
                    end
-                    yaxis[:minorgrid] && push!(yminorgrid_segs, (xmin, ytick), (xmax, ytick)) # horizontal grid
+                    push!(ytick_segs, (tick_start, ytick), (tick_stop, ytick)) # left tick
                end
+                # sp[:draw_axes_border] && push!(yaxis_segs, (xmax, ytick), (t2, ytick)) # right tick
+                yaxis[:minorgrid] && push!(yminorgrid_segs, (xmin, ytick), (xmax, ytick)) # horizontal grid
            end
        end
    end

    xticks, yticks, xaxis_segs, yaxis_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xminorgrid_segs, yminorgrid_segs, xborder_segs, yborder_segs
 end
-
-
-function axis_drawing_info_3d(sp::Subplot)
-    xaxis, yaxis, zaxis = sp[:xaxis], sp[:yaxis], sp[:zaxis]
-    xmin, xmax = axis_limits(sp, :x)
-    ymin, ymax = axis_limits(sp, :y)
-    zmin, zmax = axis_limits(sp, :z)
-    xticks = get_ticks(sp, xaxis)
-    yticks = get_ticks(sp, yaxis)
-    zticks = get_ticks(sp, zaxis)
-    xminorticks = get_minor_ticks(sp, xaxis, xticks)
-    yminorticks = get_minor_ticks(sp, yaxis, yticks)
-    zminorticks = get_minor_ticks(sp, zaxis, zticks)
-    xaxis_segs = Segments(3)
-    yaxis_segs = Segments(3)
-    zaxis_segs = Segments(3)
-    xtick_segs = Segments(3)
-    ytick_segs = Segments(3)
-    ztick_segs = Segments(3)
-    xgrid_segs = Segments(3)
-    ygrid_segs = Segments(3)
-    zgrid_segs = Segments(3)
-    xminorgrid_segs = Segments(3)
-    yminorgrid_segs = Segments(3)
-    zminorgrid_segs = Segments(3)
-    xborder_segs = Segments(3)
-    yborder_segs = Segments(3)
-    zborder_segs = Segments(3)
-
-    if sp[:framestyle] != :none
-
-        # xaxis
-        y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(xaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
-        end
-        z1, z2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(xaxis[:mirror], zaxis[:flip]) ? (zmax, zmin) : (zmin, zmax)
-        end
-        if xaxis[:showaxis]
-            if sp[:framestyle] != :grid
-                push!(xaxis_segs, (xmin, y1, z1), (xmax, y1, z1))
-                # don't show the 0 tick label for the origin framestyle
-                if sp[:framestyle] == :origin && !(xticks in (:none, nothing, false)) && length(xticks) > 1
-                    showticks = xticks[1] .!= 0
-                    xticks = (xticks[1][showticks], xticks[2][showticks])
-                end
-            end
-            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])
-            tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
-                (-t, t)
-            else
-                ticks_in = xaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(y1) + 0.012 * (f(y2) - f(y1)) * ticks_in)
-                (y1, t)
-            end
-
-            for xtick in xticks[1]
-                if xaxis[:showaxis]
-                    push!(xtick_segs, (xtick, tick_start, z1), (xtick, tick_stop, z1)) # bottom tick
-                end
-                if xaxis[:grid]
-                    if sp[:framestyle] in (:origin, :zerolines)
-                        push!(xgrid_segs, (xtick, ymin, 0.0), (xtick, ymax, 0.0))
-                        push!(xgrid_segs, (xtick, 0.0, zmin), (xtick, 0.0, zmax))
-                    else
-                        push!(xgrid_segs, (xtick, y1, z1), (xtick, y2, z1))
-                        push!(xgrid_segs, (xtick, y2, z1), (xtick, y2, z2))
-                    end
-                end
-            end
-
-            if !(xaxis[:minorticks] in (:none, nothing, false)) || xaxis[:minorgrid]
-                tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(ymax) - f(ymin)))
-                    (-t, t)
-                else
-                    t = invf(f(y1) + 0.006 * (f(y2) - f(y1)) * ticks_in)
-                    (y1, t)
-                end
-                for xtick in xminorticks
-                    if xaxis[:showaxis]
-                        push!(xtick_segs, (xtick, tick_start, z1), (xtick, tick_stop, z1)) # bottom tick
-                    end
-                    if xaxis[:minorgrid]
-                        if sp[:framestyle] in (:origin, :zerolines)
-                            push!(xminorgrid_segs, (xtick, ymin, 0.0), (xtick, ymax, 0.0))
-                            push!(xminorgrid_segs, (xtick, 0.0, zmin), (xtick, 0.0, zmax))
-                        else
-                            push!(xminorgrid_segs, (xtick, y1, z1), (xtick, y2, z1))
-                            push!(xminorgrid_segs, (xtick, y2, z1), (xtick, y2, z2))
-                        end
-                    end
-                end
-            end
-        end
-
-
-        # yaxis
-        x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(yaxis[:mirror], xaxis[:flip]) ? (xmin, xmax) : (xmax, xmin)
-        end
-        z1, z2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(yaxis[:mirror], zaxis[:flip]) ? (zmax, zmin) : (zmin, zmax)
-        end
-        if yaxis[:showaxis]
-            if sp[:framestyle] != :grid
-                push!(yaxis_segs, (x1, ymin, z1), (x1, ymax, z1))
-                # don't show the 0 tick label for the origin framestyle
-                if sp[:framestyle] == :origin && !(yticks in (:none, nothing,false)) && length(yticks) > 1
-                    showticks = yticks[1] .!= 0
-                    yticks = (yticks[1][showticks], yticks[2][showticks])
-                end
-            end
-            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])
-            tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(xmax) - f(xmin)))
-                (-t, t)
-            else
-                ticks_in = yaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(x1) + 0.012 * (f(x2) - f(x1)) * ticks_in)
-                (x1, t)
-            end
-
-            for ytick in yticks[1]
-                if yaxis[:showaxis]
-                    push!(ytick_segs, (tick_start, ytick, z1), (tick_stop, ytick, z1)) # left tick
-                end
-                if yaxis[:grid]
-                    if sp[:framestyle] in (:origin, :zerolines)
-                        push!(ygrid_segs, (xmin, ytick, 0.0), (xmax, ytick, 0.0))
-                        push!(ygrid_segs, (0.0, ytick, zmin), (0.0, ytick, zmax))
-                    else
-                        push!(ygrid_segs, (x1, ytick, z1), (x2, ytick, z1))
-                        push!(ygrid_segs, (x2, ytick, z1), (x2, ytick, z2))
-                    end
-                end
-            end
-
-            if !(yaxis[:minorticks] in (:none, nothing, false)) || yaxis[:minorgrid]
-                tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(xmax) - f(xmin)))
-                    (-t, t)
-                else
-                    t = invf(f(x1) + 0.006 * (f(x2) - f(x1)) * ticks_in)
-                    (x1, t)
-                end
-                for ytick in yminorticks
-                    if yaxis[:showaxis]
-                        push!(ytick_segs, (tick_start, ytick, z1), (tick_stop, ytick, z1)) # left tick
-                    end
-                    if yaxis[:minorgrid]
-                        if sp[:framestyle] in (:origin, :zerolines)
-                            push!(yminorgrid_segs, (xmin, ytick, 0.0), (xmax, ytick, 0.0))
-                            push!(yminorgrid_segs, (0.0, ytick, zmin), (0.0, ytick, zmax))
-                        else
-                            push!(yminorgrid_segs, (x1, ytick, z1), (x2, ytick, z1))
-                            push!(yminorgrid_segs, (x2, ytick, z1), (x2, ytick, z2))
-                        end
-                    end
-                end
-            end
-        end
-
-
-        # zaxis
-        x1, x2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(zaxis[:mirror], xaxis[:flip]) ? (xmax, xmin) : (xmin, xmax)
-        end
-        y1, y2 = if sp[:framestyle] in (:origin, :zerolines)
-            0.0, 0.0
-        else
-            xor(zaxis[:mirror], yaxis[:flip]) ? (ymax, ymin) : (ymin, ymax)
-        end
-        if zaxis[:showaxis]
-            if sp[:framestyle] != :grid
-                push!(zaxis_segs, (x1, y1, zmin), (x1, y1, zmax))
-                # don't show the 0 tick label for the origin framestyle
-                if sp[:framestyle] == :origin && !(zticks in (:none, nothing,false)) && length(zticks) > 1
-                    showticks = zticks[1] .!= 0
-                    zticks = (zticks[1][showticks], zticks[2][showticks])
-                end
-            end
-            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])
-            tick_start, tick_stop = if sp[:framestyle] == :origin
-                t = invf(f(0) + 0.012 * (f(ymax) - f(ymin)))
-                (-t, t)
-            else
-                ticks_in = zaxis[:tick_direction] == :out ? -1 : 1
-                t = invf(f(y1) + 0.012 * (f(y2) - f(y1)) * ticks_in)
-                (y1, t)
-            end
-
-            for ztick in zticks[1]
-                if zaxis[:showaxis]
-                    push!(ztick_segs, (x1, tick_start, ztick), (x1, tick_stop, ztick)) # left tick
-                end
-                if zaxis[:grid]
-                    if sp[:framestyle] in (:origin, :zerolines)
-                        push!(zgrid_segs, (xmin, 0.0, ztick), (xmax, 0.0, ztick))
-                        push!(ygrid_segs, (0.0, ymin, ztick), (0.0, ymax, ztick))
-                    else
-                        push!(ygrid_segs, (x1, y1, ztick), (x1, y2, ztick))
-                        push!(ygrid_segs, (x1, y2, ztick), (x2, y2, ztick))
-                    end
-                end
-            end
-
-            if !(zaxis[:minorticks] in (:none, nothing, false)) || zaxis[:minorgrid]
-                tick_start, tick_stop = if sp[:framestyle] == :origin
-                    t = invf(f(0) + 0.006 * (f(ymax) - f(ymin)))
-                    (-t, t)
-                else
-                    t = invf(f(y1) + 0.006 * (f(y2) - f(y1)) * ticks_in)
-                    (y1, t)
-                end
-                for ztick in zminorticks
-                    if zaxis[:showaxis]
-                        push!(ztick_segs, (x1, tick_start, ztick), (x1, tick_stop, ztick)) # left tick
-                    end
-                    if zaxis[:minorgrid]
-                        if sp[:framestyle] in (:origin, :zerolines)
-                            push!(zminorgrid_segs, (xmin, 0.0, ztick), (xmax, 0.0, ztick))
-                            push!(zminorgrid_segs, (0.0, ymin, ztick), (0.0, ymax, ztick))
-                        else
-                            push!(zminorgrid_segs, (x1, y1, ztick), (x1, y2, ztick))
-                            push!(zminorgrid_segs, (x1, y2, ztick), (x2, y2, ztick))
-                        end
-                    end
-                end
-            end
-        end
-    end
-
-    xticks, yticks, zticks, xaxis_segs, yaxis_segs, zaxis_segs, xtick_segs, ytick_segs, ztick_segs, xgrid_segs, ygrid_segs, zgrid_segs, xminorgrid_segs, yminorgrid_segs, zminorgrid_segs, xborder_segs, yborder_segs, zborder_segs
-end
@@ -37,6 +37,7 @@ macro init_backend(s)
        _backendType[Symbol($str)] = $T
        _backendSymbol[$T] = Symbol($str)
        _backend_packages[Symbol($str)] = Symbol($package_str)
+        # include("backends/" * $str * ".jl")
    end)
 end

@@ -74,9 +75,9 @@ end
 text_size(lab::AbstractString, sz::Number, rot::Number = 0) = text_size(length(lab), sz, rot)

 # account for the size/length/rotation of tick labels
-function tick_padding(sp::Subplot, axis::Axis)
-    ticks = get_ticks(sp, axis)
-    if ticks === nothing
+function tick_padding(axis::Axis)
+    ticks = get_ticks(axis)
+    if ticks == nothing
        0mm
    else
        vals, labs = ticks
@@ -104,11 +105,11 @@ 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`
-    leftpad   = tick_padding(sp, sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
+    # TODO: something different when `is3d(sp) == true`
+    leftpad   = tick_padding(sp[:yaxis]) + sp[:left_margin]   + guide_padding(sp[:yaxis])
    toppad    = sp[:top_margin]    + title_padding(sp)
    rightpad  = sp[:right_margin]
-    bottompad = tick_padding(sp, sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])
+    bottompad = tick_padding(sp[:xaxis]) + sp[:bottom_margin] + guide_padding(sp[:xaxis])

    # switch them?
    if sp[:xaxis][:mirror]
@@ -142,7 +143,12 @@ function _pick_default_backend()
    if env_default != ""
        sym = Symbol(lowercase(env_default))
        if sym in _backends
-            backend(sym)
+            if sym in _initialized_backends
+                backend(sym)
+            else
+                @warn("You have set `PLOTS_DEFAULT_BACKEND=$env_default` but `$(backend_package_name(sym))` is not loaded.")
+                _fallback_default_backend()
+            end
        else
            @warn("You have set PLOTS_DEFAULT_BACKEND=$env_default but it is not a valid backend package.  Choose from:\n\t" *
                 join(sort(_backends), "\n\t"))
@@ -211,7 +217,7 @@ const _base_supported_args = [
    :seriestype,
    :seriescolor, :seriesalpha,
    :smooth,
-    :xerror, :yerror, :zerror,
+    :xerror, :yerror,
    :subplot,
    :x, :y, :z,
    :show, :size,
@@ -228,7 +234,7 @@ const _base_supported_args = [
    :subplot_index,
    :discrete_values,
    :projection,
-    :show_empty_bins
+
 ]

 function merge_with_base_supported(v::AVec)
@@ -251,7 +257,6 @@ end
@init_backend PlotlyJS
@init_backend GR
@init_backend PGFPlots
-@init_backend PGFPlotsX
@init_backend InspectDR
@init_backend HDF5

@@ -296,6 +301,9 @@ end

 _initialize_backend(pkg::GRBackend) = nothing

+_initialize_backend(pkg::PlotlyBackend) = nothing
+
+
 # ------------------------------------------------------------------------------
 # gr

@@ -324,7 +332,7 @@ const _gr_attr = merge_with_base_supported([
    :guidefontfamily, :guidefontsize, :guidefonthalign, :guidefontvalign,
    :guidefontrotation, :guidefontcolor,
    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
+    :legend, :legendtitle, :colorbar, :colorbar_title,
    :fill_z, :line_z, :marker_z, :levels,
    :ribbon, :quiver,
    :orientation,
@@ -343,7 +351,7 @@ const _gr_attr = merge_with_base_supported([
 const _gr_seriestype = [
    :path, :scatter, :straightline,
    :heatmap, :pie, :image,
-    :contour, :path3d, :scatter3d, :surface, :wireframe, :volume,
+    :contour, :path3d, :scatter3d, :surface, :wireframe,
    :shape
 ]
 const _gr_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
@@ -354,16 +362,6 @@ is_marker_supported(::GRBackend, shape::Shape) = true
 # ------------------------------------------------------------------------------
 # plotly

-function _initialize_backend(pkg::PlotlyBackend)
-    try
-        @eval Main begin
-            import ORCA
-        end
-    catch
-        @info "For saving to png with the Plotly backend ORCA has to be installed."
-    end
-end
-
 const _plotly_attr = merge_with_base_supported([
    :annotations,
    :background_color_legend, :background_color_inside, :background_color_outside,
@@ -388,7 +386,7 @@ const _plotly_attr = merge_with_base_supported([
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
    :grid, :gridalpha, :gridlinewidth,
-    :legend, :colorbar, :colorbar_title, :colorbar_entry,
+    :legend, :colorbar, :colorbar_title,
    :marker_z, :fill_z, :line_z, :levels,
    :ribbon, :quiver,
    :orientation,
@@ -419,8 +417,6 @@ const _plotly_marker = [
 ]
 const _plotly_scale = [:identity, :log10]

-defaultOutputFormat(plt::Plot{Plots.PlotlyBackend}) = "html"
-
 # ------------------------------------------------------------------------------
 # pgfplots

@@ -461,7 +457,7 @@ const _pgfplots_attr = merge_with_base_supported([
 ])
 const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,]
 const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline, :vline] #vcat(_allMarkers, Shape)
+const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline] #vcat(_allMarkers, Shape)
 const _pgfplots_scale = [:identity, :ln, :log2, :log10]

 # ------------------------------------------------------------------------------
@@ -513,7 +509,7 @@ const _pyplot_attr = merge_with_base_supported([
    :tickfontfamily, :tickfontsize, :tickfontcolor,
    :guidefontfamily, :guidefontsize, :guidefontcolor,
    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar, :colorbar_title, :colorbar_entry,
+    :legend, :legendtitle, :colorbar,
    :marker_z, :line_z, :fill_z,
    :levels,
    :ribbon, :quiver, :arrow,
@@ -526,6 +522,7 @@ const _pyplot_attr = merge_with_base_supported([
    :clims,
    :inset_subplots,
    :dpi,
+    :colorbar_title,
    :stride,
    :framestyle,
    :tick_direction,
@@ -668,135 +665,3 @@ const _inspectdr_marker = Symbol[
 ]

 const _inspectdr_scale = [:identity, :ln, :log2, :log10]
-# ------------------------------------------------------------------------------
-# pgfplotsx
-
-const _pgfplotsx_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend,
-    :background_color_inside,
-    :background_color_outside,
-    :foreground_color_legend,
-    :foreground_color_grid,
-    :foreground_color_axis,
-    :foreground_color_text,
-    :foreground_color_border,
-    :label,
-    :seriescolor,
-    :seriesalpha,
-    :linecolor,
-    :linestyle,
-    :linewidth,
-    :linealpha,
-    :markershape,
-    :markercolor,
-    :markersize,
-    :markeralpha,
-    :markerstrokewidth,
-    :markerstrokecolor,
-    :markerstrokealpha,
-    :fillrange,
-    :fillcolor,
-    :fillalpha,
-    :bins,
-    :layout,
-    :title,
-    :window_title,
-    :guide,
-    :lims,
-    :ticks,
-    :scale,
-    :flip,
-    :match_dimensions,
-    :titlefontfamily,
-    :titlefontsize,
-    :titlefonthalign,
-    :titlefontvalign,
-    :titlefontrotation,
-    :titlefontcolor,
-    :legendfontfamily,
-    :legendfontsize,
-    :legendfonthalign,
-    :legendfontvalign,
-    :legendfontrotation,
-    :legendfontcolor,
-    :tickfontfamily,
-    :tickfontsize,
-    :tickfonthalign,
-    :tickfontvalign,
-    :tickfontrotation,
-    :tickfontcolor,
-    :guidefontfamily,
-    :guidefontsize,
-    :guidefonthalign,
-    :guidefontvalign,
-    :guidefontrotation,
-    :guidefontcolor,
-    :grid,
-    :gridalpha,
-    :gridstyle,
-    :gridlinewidth,
-    :legend,
-    :legendtitle,
-    :colorbar,
-    :colorbar_title,
-    :colorbar_entry,
-    :fill_z,
-    :line_z,
-    :marker_z,
-    :levels,
-    :ribbon,
-    :quiver,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :aspect_ratio,
-    :normalize,
-    :weights,
-    :inset_subplots,
-    :bar_width,
-    :arrow,
-    :framestyle,
-    :tick_direction,
-    :camera,
-    :contour_labels,
-])
-const _pgfplotsx_seriestype = [
-    :path,
-    :scatter,
-    :straightline,
-    :path3d,
-    :scatter3d,
-    :surface,
-    :wireframe,
-    :heatmap,
-    :contour,
-    :contour3d,
-    :shape,
-    :steppre,
-    :stepmid,
-    :steppost,
-    :ysticks,
-    :xsticks,
-]
-const _pgfplotsx_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplotsx_marker = [
-    :none,
-    :auto,
-    :circle,
-    :rect,
-    :diamond,
-    :utriangle,
-    :dtriangle,
-    :ltriangle,
-    :rtriangle,
-    :cross,
-    :xcross,
-    :star5,
-    :pentagon,
-    :hline,
-    :vline,
-    Shape,
-]
-const _pgfplotsx_scale = [:identity, :ln, :log2, :log10]
-is_marker_supported(::PGFPlotsXBackend, shape::Shape) = true
@@ -83,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,
@@ -110,7 +109,7 @@ _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::Dict, src::Dict)
    for (k, v) in src
        if isa(v, Axis)
            _hdf5_merge!(dest[k].plotattributes, v.plotattributes)
@@ -264,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
@@ -305,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::Dict)
 #    @warn("Cannot write dict: $k=$plotattributes")
 end
 function _hdf5plot_gwrite(grp, k::String, v::AbstractRange)
@@ -387,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::Dict)
    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:
 # ----------------------------------------------------------------
@@ -465,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")
@@ -483,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
@@ -502,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")
@@ -522,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")
@@ -558,36 +544,22 @@ 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], _hdf5plot_datatypeid)
    T = _hdf5_map_str2telem(dtid) #expect exception
@@ -595,7 +567,7 @@ function _hdf5plot_read(grp, k::String)
 end

 #Read in values in group to populate plotattributes:
-function _hdf5plot_readattr(grp, plotattributes::AbstractDict)
+function _hdf5plot_read(grp, plotattributes::Dict)
    gnames = names(grp)
    for k in gnames
        try
@@ -609,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:
 # ----------------------------------------------------------------
@@ -623,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
@@ -121,9 +121,9 @@ function _create_backend_figure(plt::Plot{InspectDRBackend})
    gplot = _inspectdr_getgui(plt.o)

    #:overwrite_figure: want to reuse current figure
-    if plt[:overwrite_figure] && mplot !== nothing
+    if plt[:overwrite_figure] && mplot != nothing
        mplot.subplots = [] #Reset
-        if gplot !== nothing #Ensure still references current plot
+        if gplot != nothing #Ensure still references current plot
            gplot.src = mplot
        end
    else #want new one:
@@ -294,8 +294,8 @@ function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})

        plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
        strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
-        xmin, xmax  = axis_limits(sp, :x)
-        ymin, ymax  = axis_limits(sp, :y)
+        xmin, xmax  = axis_limits(xaxis)
+        ymin, ymax  = axis_limits(yaxis)
        if ispolar(sp)
            #Plots.jl appears to give (xmin,xmax) ≜ (Θmin,Θmax) & (ymin,ymax) ≜ (rmin,rmax)
            rmax = NaNMath.max(abs(ymin), abs(ymax))
@@ -1,24 +0,0 @@
-function plotlybase_syncplot(plt::Plot)
-    plt.o = ORCA.PlotlyBase.Plot()
-    traces = ORCA.PlotlyBase.GenericTrace[]
-    for series_dict in plotly_series(plt)
-        plotly_type = pop!(series_dict, :type)
-        push!(traces, ORCA.PlotlyBase.GenericTrace(plotly_type; series_dict...))
-    end
-    ORCA.PlotlyBase.addtraces!(plt.o, traces...)
-    layout = plotly_layout(plt)
-    w, h = plt[:size]
-    ORCA.PlotlyBase.relayout!(plt.o, layout, width = w, height = h)
-    return plt.o
-end
-
-const _orca_mimeformats = Dict(
-    "application/pdf" => "pdf",
-    "image/png"       => "png",
-    "image/svg+xml"   => "svg",
-    "image/eps"       => "eps",
-)
-
-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
@@ -26,8 +26,7 @@ const _pgfplots_markers = KW(
    :star6 => "asterisk",
    :diamond => "diamond*",
    :pentagon => "pentagon*",
-    :hline => "-",
-    :vline => "|"
+    :hline => "-"
 )

 const _pgfplots_legend_pos = KW(
@@ -96,7 +95,7 @@ pgf_thickness_scaling(series) = pgf_thickness_scaling(series[:subplot])
 function pgf_fillstyle(plotattributes, i = 1)
    cstr,a = pgf_color(get_fillcolor(plotattributes, i))
    fa = get_fillalpha(plotattributes, i)
-    if fa !== nothing
+    if fa != nothing
        a = fa
    end
    "fill = $cstr, fill opacity=$a"
@@ -128,18 +127,16 @@ function pgf_marker(plotattributes, i = 1)
    shape = _cycle(plotattributes[:markershape], i)
    cstr, a = pgf_color(plot_color(get_markercolor(plotattributes, i), get_markeralpha(plotattributes, i)))
    cstr_stroke, a_stroke = pgf_color(plot_color(get_markerstrokecolor(plotattributes, i), get_markerstrokealpha(plotattributes, i)))
-    return string(
-        "mark = $(get(_pgfplots_markers, shape, "*")),\n",
-        "mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),\n",
-        plotattributes[:seriestype] == :scatter ? "only marks,\n" : "",
-        "mark options = {
-            color = $cstr_stroke, draw opacity = $a_stroke,
-            fill = $cstr, fill opacity = $a,
-            line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
-            rotate = $(shape == :dtriangle ? 180 : 0),
-            $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
-        }"
-        )
+    """
+    mark = $(get(_pgfplots_markers, shape, "*")),
+    mark size = $(pgf_thickness_scaling(plotattributes) * 0.5 * _cycle(plotattributes[:markersize], i)),
+    mark options = {
+        color = $cstr_stroke, draw opacity = $a_stroke,
+        fill = $cstr, fill opacity = $a,
+        line width = $(pgf_thickness_scaling(plotattributes) * _cycle(plotattributes[:markerstrokewidth], i)),
+        rotate = $(shape == :dtriangle ? 180 : 0),
+        $(get(_pgfplots_linestyles, _cycle(plotattributes[:markerstrokestyle], i), "solid"))
+    }"""
 end

 function pgf_add_annotation!(o, x, y, val, thickness_scaling = 1)
@@ -166,25 +163,25 @@ 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)
    elseif st == :shape
        shape_data(series)
    elseif ispolar(sp)
-        theta, r = plotattributes[:x], plotattributes[:y]
+        theta, r = filter_radial_data(plotattributes[:x], plotattributes[:y], axis_limits(sp[:yaxis]))
        rad2deg.(theta), r
    else
        plotattributes[:x], plotattributes[:y]
    end

    # PGFPlots can't handle non-Vector?
-    # args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
-    #         collect(a)
-    #     else
-    #         a
-    #     end, args)
+    args = map(a -> if typeof(a) <: AbstractVector && typeof(a) != Vector
+            collect(a)
+        else
+            a
+        end, args)

    if st in (:contour, :histogram2d)
        style = []
@@ -218,12 +215,12 @@ function pgf_series(sp::Subplot, series::Series)

            # add to legend?
            if i == 1 && sp[:legend] != :none && should_add_to_legend(series)
-                if plotattributes[:fillrange] !== nothing
+                if plotattributes[:fillrange] != nothing
                    push!(style, "forget plot")
                    push!(series_collection, pgf_fill_legend_hack(plotattributes, args))
                else
                    kw[:legendentry] = plotattributes[:label]
-                    if st == :shape # || plotattributes[:fillrange] !== nothing
+                    if st == :shape # || plotattributes[:fillrange] != nothing
                        push!(style, "area legend")
                    end
                end
@@ -240,7 +237,7 @@ function pgf_series(sp::Subplot, series::Series)
            kw[:style] = join(style, ',')

            # add fillrange
-            if series[:fillrange] !== nothing && st != :shape
+            if series[:fillrange] != nothing && st != :shape
                push!(series_collection, pgf_fillrange_series(series, i, _cycle(series[:fillrange], rng), seg_args...))
            end

@@ -271,7 +268,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

@@ -363,13 +360,13 @@ function pgf_axis(sp::Subplot, letter)
    # limits
    # TODO: support zlims
    if letter != :z
-        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(sp, :x)) : axis_limits(sp, letter)
+        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(axis)) : axis_limits(axis)
        kw[Symbol(letter,:min)] = lims[1]
        kw[Symbol(letter,:max)] = lims[2]
    end

    if !(axis[:ticks] in (nothing, false, :none, :native)) && framestyle != :none
-        ticks = get_ticks(sp, axis)
+        ticks = get_ticks(axis)
        #pgf plot ignores ticks with angle below 90 when xmin = 90 so shift values
        tick_values = ispolar(sp) && letter == :x ? [rad2deg.(ticks[1])[3:end]..., 360, 405] : ticks[1]
        push!(style, string(letter, "tick = {", join(tick_values,","), "}"))
@@ -401,12 +398,8 @@ function pgf_axis(sp::Subplot, letter)
    # framestyle
    if framestyle in (:axes, :origin)
        axispos = framestyle == :axes ? "left" : "middle"
-        if axis[:draw_arrow]
-            push!(style, string("axis ", letter, " line = ", axispos))
-        else
-            # the * after line disables the arrow at the axis
-            push!(style, string("axis ", letter, " line* = ", axispos))
-        end
+        # the * after lines disables the arrows at the axes
+        push!(style, string("axis lines* = ", axispos))
    end

    if framestyle == :zerolines
@@ -444,7 +437,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)
@@ -470,7 +463,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            push!(style, string("title style = {font = ", pgf_font(sp[:titlefontsize], pgf_thickness_scaling(sp)), ", color = ", cstr, ", draw opacity = ", α, ", rotate = ", sp[:titlefontrotation], "}"))
        end

-        if get_aspect_ratio(sp) in (1, :equal)
+        if sp[:aspect_ratio] in (1, :equal)
            kw[:axisEqual] = "true"
        end

@@ -478,23 +471,13 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
        if haskey(_pgfplots_legend_pos, legpos)
            kw[:legendPos] = _pgfplots_legend_pos[legpos]
        end
-        cstr, bg_alpha = pgf_color(plot_color(sp[:background_color_legend]))
-        fg_alpha = alpha(plot_color(sp[:foreground_color_legend]))
-
-        push!(style, string(
-            "legend style = {",
-                pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], fg_alpha, "solid", ), ",",
-                "fill = $cstr,",
-                "fill opacity = $bg_alpha,",
-                "text opacity = $(alpha(plot_color(sp[:legendfontcolor]))),",
-                "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)),
-            "}",
-        ))
+        cstr, a = pgf_color(plot_color(sp[:background_color_legend]))
+        push!(style, string("legend style = {", pgf_linestyle(pgf_thickness_scaling(sp), sp[:foreground_color_legend], 1.0, "solid"), ",", "fill = $cstr,", "font = ", pgf_font(sp[:legendfontsize], pgf_thickness_scaling(sp)), "}"))

        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
@@ -580,7 +563,7 @@ end

 function _show(io::IO, mime::MIME"application/x-tex", plt::Plot{PGFPlotsBackend})
    fn = tempname()*".tex"
-    PGFPlots.save(fn, backend_object(plt), include_preamble=plt.attr[:tex_output_standalone])
+    PGFPlots.save(fn, backend_object(plt), include_preamble=false)
    write(io, read(open(fn), String))
 end

@@ -26,6 +26,7 @@ const plotly_remote_file_path = "https://cdn.plot.ly/plotly-latest.min.js"
 # end
 using UUIDs

+push!(_initialized_backends, :plotly)
 # ----------------------------------------------------------------

 const _plotly_legend_pos = KW(
@@ -108,13 +109,13 @@ function shrink_by(lo, sz, ratio)
 end

 function plotly_apply_aspect_ratio(sp::Subplot, plotarea, pcts)
-    aspect_ratio = get_aspect_ratio(sp)
+    aspect_ratio = sp[:aspect_ratio]
    if aspect_ratio != :none
        if aspect_ratio == :equal
            aspect_ratio = 1.0
        end
-        xmin,xmax = axis_limits(sp, :x)
-        ymin,ymax = axis_limits(sp, :y)
+        xmin,xmax = axis_limits(sp[:xaxis])
+        ymin,ymax = axis_limits(sp[:yaxis])
        want_ratio = ((xmax-xmin) / (ymax-ymin)) / aspect_ratio
        parea_ratio = width(plotarea) / height(plotarea)
        if want_ratio > parea_ratio
@@ -162,7 +163,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
@@ -173,10 +174,10 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)

    ax[:tickangle] = -axis[:rotation]
    ax[:type] = plotly_scale(axis[:scale])
-    lims = axis_limits(sp, letter)
+    lims = axis_limits(axis)

    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))
@@ -185,9 +186,14 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
        ax[:tickcolor] = framestyle in (:zerolines, :grid) || !axis[:showaxis] ? rgba_string(invisible()) : rgb_string(axis[:foreground_color_axis])
        ax[:linecolor] = rgba_string(axis[:foreground_color_axis])

+        # flip
+        if axis[:flip]
+            ax[:range] = reverse(ax[:range])
+        end
+
        # ticks
        if axis[:ticks] != :native
-            ticks = get_ticks(sp, axis)
+            ticks = get_ticks(axis)
            ttype = ticksType(ticks)
            if ttype == :ticks
                ax[:tickmode] = "array"
@@ -202,24 +208,20 @@ function plotly_axis(plt::Plot, axis::Axis, sp::Subplot)
        ax[:showgrid] = false
    end

-    # flip
-    if axis[:flip]
-        ax[:range] = reverse(ax[:range])
-    end

    ax
 end

-function plotly_polaraxis(sp::Subplot, axis::Axis)
+function plotly_polaraxis(axis::Axis)
    ax = KW(
        :visible => axis[:showaxis],
        :showline => axis[:grid],
    )

    if axis[:letter] == :x
-        ax[:range] = rad2deg.(axis_limits(sp, :x))
+        ax[:range] = rad2deg.(axis_limits(axis))
    else
-        ax[:range] = axis_limits(sp, :y)
+        ax[:range] = axis_limits(axis)
        ax[:orientation] = -90
    end

@@ -263,8 +265,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(
@@ -282,8 +284,8 @@ function plotly_layout(plt::Plot)
                ),
            )
        elseif ispolar(sp)
-            plotattributes_out[Symbol("angularaxis$(spidx)")] = plotly_polaraxis(sp, sp[:xaxis])
-            plotattributes_out[Symbol("radialaxis$(spidx)")] = plotly_polaraxis(sp, sp[:yaxis])
+            plotattributes_out[Symbol("angularaxis$(spidx)")] = plotly_polaraxis(sp[:xaxis])
+            plotattributes_out[Symbol("radialaxis$(spidx)")] = plotly_polaraxis(sp[:yaxis])
        else
            plotattributes_out[Symbol("xaxis$(x_idx)")] = plotly_axis(plt, sp[:xaxis], sp)
            # don't allow yaxis to be reupdated/reanchored in a linked subplot
@@ -346,14 +348,14 @@ function plotly_layout(plt::Plot)
 end

 function plotly_layout_json(plt::Plot)
-    JSON.json(plotly_layout(plt), 4)
+    JSON.json(plotly_layout(plt))
 end


 function plotly_colorscale(grad::ColorGradient, α)
-    [[grad.values[i], rgba_string(plot_color(grad.colors[i], α))] for i in eachindex(grad.colors)]
+    [[grad.values[i], rgba_string(plot_color(grad.colors[i], α))] for i in 1:length(grad.colors)]
 end
-plotly_colorscale(c::Colorant,α) = plotly_colorscale(_as_gradient(c),α)
+plotly_colorscale(c, α) = plotly_colorscale(cgrad(alpha=α), α)
 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], α))]]
@@ -392,7 +394,7 @@ end
 # we split by NaNs and then construct/destruct the shapes to get the closed coords
 function plotly_close_shapes(x, y)
    xs, ys = nansplit(x), nansplit(y)
-    for i=eachindex(xs)
+    for i=1:length(xs)
        shape = Shape(xs[i], ys[i])
        xs[i], ys[i] = coords(shape)
    end
@@ -402,7 +404,7 @@ end
 function plotly_data(series::Series, letter::Symbol, data)
    axis = series[:subplot][Symbol(letter, :axis)]

-    data = if axis[:ticks] == :native && data !== nothing
+    data = if axis[:ticks] == :native && data != nothing
        plotly_native_data(axis, data)
    else
       data
@@ -414,8 +416,7 @@ function plotly_data(series::Series, letter::Symbol, data)
        plotly_data(data)
    end
 end
-plotly_data(v) = v !== nothing ? collect(v) : v
-plotly_data(v::AbstractArray) = v
+plotly_data(v) = v != nothing ? collect(v) : v
 plotly_data(surf::Surface) = surf.surf
 plotly_data(v::AbstractArray{R}) where {R<:Rational} = float(v)

@@ -436,7 +437,7 @@ plotly_native_data(axis::Axis, a::Surface) = Surface(plotly_native_data(axis, a.

 function plotly_convert_to_datetime(x::AbstractArray, formatter::Function)
    if formatter == datetimeformatter
-        map(xi -> replace(formatter(xi), "T" => " "), x)
+        map(xi -> replace(formatter(xi), "T", " "), x)
    elseif formatter == dateformatter
        map(xi -> string(formatter(xi), " 00:00:00"), x)
    elseif formatter == timeformatter
@@ -454,7 +455,7 @@ function plotly_series(plt::Plot, series::Series)
    st = series[:seriestype]

    sp = series[:subplot]
-    clims = get_clims(sp, series)
+    clims = get_clims(sp)

    if st == :shape
        return plotly_series_shapes(plt, series, clims)
@@ -469,7 +470,7 @@ function plotly_series(plt::Plot, series::Series)
    plotattributes_out[:showlegend] = should_add_to_legend(series)

    if st == :straightline
-        x, y = straightline_data(series, 100)
+        x, y = straightline_data(series)
        z = series[:z]
    else
        x, y, z  = series[:x], series[:y], series[:z]
@@ -506,13 +507,13 @@ function plotly_series(plt::Plot, series::Series)
        plotattributes_out[:showscale] = hascolorbar(sp)

    elseif st == :contour
-        filled = isfilledcontour(series)
        plotattributes_out[:type] = "contour"
        plotattributes_out[:x], plotattributes_out[:y], plotattributes_out[:z] = x, y, z
-        plotattributes_out[:ncontours] = series[:levels] + 2
-        plotattributes_out[:contours] = KW(:coloring => filled ? "fill" : "lines", :showlabels => series[:contour_labels] == true)
+        # plotattributes_out[:showscale] = series[:colorbar] != :none
+        plotattributes_out[:ncontours] = series[:levels]
+        plotattributes_out[:contours] = KW(:coloring => series[:fillrange] != nothing ? "fill" : "lines", :showlabels => series[:contour_labels] == true)
        plotattributes_out[:colorscale] = plotly_colorscale(series[:linecolor], series[:linealpha])
-        plotattributes_out[:showscale] = hascolorbar(sp) && hascolorbar(series)
+        plotattributes_out[:showscale] = hascolorbar(sp)

    elseif st in (:surface, :wireframe)
        plotattributes_out[:type] = "surface"
@@ -529,7 +530,7 @@ function plotly_series(plt::Plot, series::Series)
        else
            plotattributes_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
            plotattributes_out[:opacity] = series[:fillalpha]
-            if series[:fill_z] !== nothing
+            if series[:fill_z] != nothing
                plotattributes_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
            end
            plotattributes_out[:showscale] = hascolorbar(sp)
@@ -584,7 +585,7 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
    )

    x, y = (plotly_data(series, letter, data)
-        for (letter, data) in zip((:x, :y), shape_data(series, 100))
+        for (letter, data) in zip((:x, :y), shape_data(series))
    )

    for (i,rng) in enumerate(segments)
@@ -611,11 +612,11 @@ function plotly_series_shapes(plt::Plot, series::Series, clims)
        plotly_hover!(plotattributes_out, _cycle(series[:hover], i))
        plotattributes_outs[i] = plotattributes_out
    end
-    if series[:fill_z] !== nothing
+    if series[:fill_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :fill))
-    elseif series[:line_z] !== nothing
+    elseif series[:line_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :line))
-    elseif series[:marker_z] !== nothing
+    elseif series[:marker_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :marker))
    end
    plotattributes_outs
@@ -631,9 +632,11 @@ function plotly_series_segments(series::Series, plotattributes_base::KW, x, y, z
        (isa(series[:fillrange], AbstractVector) || isa(series[:fillrange], Tuple))

    segments = iter_segments(series)
-    plotattributes_outs = fill(KW(), (hasfillrange ? 2 : 1 ) * length(segments))
+    plotattributes_outs = Vector{KW}(undef, (hasfillrange ? 2 : 1 ) * length(segments))

    for (i,rng) in enumerate(segments)
+        !isscatter && length(rng) < 2 && continue
+
        plotattributes_out = deepcopy(plotattributes_base)
        plotattributes_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
        plotattributes_out[:legendgroup] = series[:label]
@@ -733,11 +736,11 @@ function plotly_series_segments(series::Series, plotattributes_base::KW, x, y, z
        end
    end

-    if series[:line_z] !== nothing
+    if series[:line_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :line))
-    elseif series[:fill_z] !== nothing
+    elseif series[:fill_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :fill))
-    elseif series[:marker_z] !== nothing
+    elseif series[:marker_z] != nothing
        push!(plotattributes_outs, plotly_colorbar_hack(series, plotattributes_base, :marker))
    end

@@ -748,11 +751,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)
@@ -772,7 +775,7 @@ end
 function plotly_polar!(plotattributes_out::KW, series::Series)
    # convert polar plots x/y to theta/radius
    if ispolar(series[:subplot])
-        theta, r = pop!(plotattributes_out, :x), pop!(plotattributes_out, :y)
+        theta, r = filter_radial_data(pop!(plotattributes_out, :x), pop!(plotattributes_out, :y), axis_limits(series[:subplot][:yaxis]))
        plotattributes_out[:t] = rad2deg.(theta)
        plotattributes_out[:r] = r
    end
@@ -780,9 +783,9 @@ end

 function plotly_hover!(plotattributes_out::KW, hover)
    # hover text
-    if hover === nothing || all(in([:none, false]), hover)
+    if hover in (:none, false)
        plotattributes_out[:hoverinfo] = "none"
-    elseif any(!isnothing, hover)
+    elseif hover != nothing
        plotattributes_out[:hoverinfo] = "text"
        plotattributes_out[:text] = hover
    end
@@ -798,16 +801,13 @@ function plotly_series(plt::Plot)
 end

 # get json string for a list of dictionaries, each representing the series params
-plotly_series_json(plt::Plot) = JSON.json(plotly_series(plt), 4)
+plotly_series_json(plt::Plot) = JSON.json(plotly_series(plt))

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

-html_head(plt::Plot{PlotlyBackend}) = plotly_html_head(plt)
-html_body(plt::Plot{PlotlyBackend}) = plotly_html_body(plt)
-
 const ijulia_initialized = Ref(false)

-function plotly_html_head(plt::Plot)
+function html_head(plt::Plot{PlotlyBackend})
    local_file = ("file://" * plotly_local_file_path)
    plotly = use_local_dependencies[] ? local_file : plotly_remote_file_path
    if isijulia() && !ijulia_initialized[]
@@ -823,11 +823,13 @@ function plotly_html_head(plt::Plot)
        """)
        ijulia_initialized[] = true
    end
+    # IJulia just needs one initialization
+    isijulia() && return ""
    return "<script src=$(repr(plotly))></script>"
 end

-function plotly_html_body(plt, style = nothing)
-    if style === nothing
+function html_body(plt::Plot{PlotlyBackend}, style = nothing)
+    if style == nothing
        w, h = plt[:size]
        style = "width:$(w)px;height:$(h)px;"
    end
@@ -842,36 +844,21 @@ function plotly_html_body(plt, style = nothing)
    html
 end

-function js_body(plt::Plot, uuid)
+function js_body(plt::Plot{PlotlyBackend}, uuid)
    js = """
        PLOT = document.getElementById('$(uuid)');
        Plotly.plot(PLOT, $(plotly_series_json(plt)), $(plotly_layout_json(plt)));
    """
 end

-function plotly_show_js(io::IO, plot::Plot)
-    data = []
-    for series in plot.series_list
-        append!(data, plotly_series(plot, series))
-    end
-    layout = plotly_layout(plot)
-    JSON.print(io, Dict(:data => data, :layout => layout))
-end

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

-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot{PlotlyBackend}) = true
-
-function _show(io::IO, ::MIME"application/vnd.plotly.v1+json", plot::Plot{PlotlyBackend})
-    plotly_show_js(io, plot)
-end
-

 function _show(io::IO, ::MIME"text/html", plt::Plot{PlotlyBackend})
-    write(io, standalone_html(plt))
+    write(io, html_head(plt) * html_body(plt))
 end

-
 function _display(plt::Plot{PlotlyBackend})
    standalone_html_window(plt)
 end
@@ -1,48 +1,79 @@
 # https://github.com/sglyon/PlotlyJS.jl

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

-function plotlyjs_syncplot(plt::Plot{PlotlyJSBackend})
-    plt[:overwrite_figure] && closeall()
-    plt.o = PlotlyJS.plot()
-    traces = PlotlyJS.GenericTrace[]
-    for series_dict in plotly_series(plt)
-        plotly_type = pop!(series_dict, :type)
-        push!(traces, PlotlyJS.GenericTrace(plotly_type; series_dict...))
+
+function _create_backend_figure(plt::Plot{PlotlyJSBackend})
+    if !isplotnull() && plt[:overwrite_figure] && isa(current().o, PlotlyJS.SyncPlot)
+        PlotlyJS.SyncPlot(PlotlyJS.Plot(), options = current().o.options)
+    else
+        PlotlyJS.plot()
    end
-    PlotlyJS.addtraces!(plt.o, traces...)
-    layout = plotly_layout(plt)
-    w, h = plt[:size]
-    PlotlyJS.relayout!(plt.o, layout, width = w, height = h)
-    return plt.o
 end

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

-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)
+function _series_added(plt::Plot{PlotlyJSBackend}, series::Series)
+    syncplot = plt.o
+    pdicts = plotly_series(plt, series)
+    for pdict in pdicts
+        typ = pop!(pdict, :type)
+        gt = PlotlyJS.GenericTrace(typ; pdict...)
+        PlotlyJS.addtraces!(syncplot, gt)
+    end
 end

-# Use the Plotly implementation for json and html:
-_show(io::IO, mime::MIME"application/vnd.plotly.v1+json", plt::Plot{PlotlyJSBackend}) = plotly_show_js(io, plt)
+function _series_updated(plt::Plot{PlotlyJSBackend}, series::Series)
+    xsym, ysym = (ispolar(series) ? (:t,:r) : (:x,:y))
+    kw = KW(xsym => (series.plotattributes[:x],), ysym => (series.plotattributes[:y],))
+    z = series[:z]
+    if z != nothing
+        kw[:z] = (isa(z,Surface) ? transpose_z(series, series[:z].surf, false) : z,)
+    end
+    PlotlyJS.restyle!(
+        plt.o,
+        findfirst(isequal(series), plt.series_list),
+        kw
+    )
+end

-html_head(plt::Plot{PlotlyJSBackend}) = plotly_html_head(plt)
-html_body(plt::Plot{PlotlyJSBackend}) = plotly_html_body(plt)

-_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = write(io, standalone_html(plt))
+# ----------------------------------------------------------------

-_display(plt::Plot{PlotlyJSBackend}) = display(plotlyjs_syncplot(plt))
+function _update_plot_object(plt::Plot{PlotlyJSBackend})
+    pdict = plotly_layout(plt)
+    syncplot = plt.o
+    w,h = plt[:size]
+    PlotlyJS.relayout!(syncplot, pdict, width = w, height = h)
+end

-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))
+
+# ----------------------------------------------------------------
+
+_show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend}) = show(io, MIME("text/html"), plt.o)
+_show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="svg")
+_show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="png")
+_show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="pdf")
+_show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = PlotlyJS.savefig(io, plt.o, format="eps")
+
+function write_temp_html(plt::Plot{PlotlyJSBackend})
+    filename = string(tempname(), ".html")
+    savefig(plt, filename)
+    filename
+end
+
+function _display(plt::Plot{PlotlyJSBackend})
+    if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
+        display(plt.o)
+    else
+        standalone_html_window(plt)
+    end
+end
+
+@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)
@@ -50,5 +81,3 @@ function closeall(::PlotlyJSBackend)
        close(current().o)
    end
 end
-
-Base.showable(::MIME"application/prs.juno.plotpane+html", plt::Plot{PlotlyJSBackend}) = true
@@ -27,8 +27,8 @@ function rebuildUnicodePlot!(plt::Plot, width, height)
    for sp in plt.subplots
        xaxis = sp[:xaxis]
        yaxis = sp[:yaxis]
-        xlim =  axis_limits(sp, :x)
-        ylim =  axis_limits(sp, :y)
+        xlim =  axis_limits(xaxis)
+        ylim =  axis_limits(yaxis)

        # make vectors
        xlim = [xlim[1], xlim[2]]
@@ -92,7 +92,7 @@ end


 # add a single series
-function addUnicodeSeries!(o, plotattributes, addlegend::Bool, xlim, ylim)
+function addUnicodeSeries!(o, plotattributes::KW, addlegend::Bool, xlim, ylim)
    # get the function, or special handling for step/bar/hist
    st = plotattributes[:seriestype]
    if st == :histogram2d
@@ -116,7 +116,7 @@ function addUnicodeSeries!(o, plotattributes, addlegend::Bool, xlim, ylim)
    x, y = if st == :straightline
        straightline_data(plotattributes)
    elseif st == :shape
-        shape_data(plotattributes)
+        shape_data(series)
    else
        [collect(float(plotattributes[s])) for s in (:x, :y)]
    end
@@ -126,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

@@ -1,7 +1,7 @@


-const P2 = GeometryTypes.Point2{Float64}
-const P3 = GeometryTypes.Point3{Float64}
+const P2 = StaticArrays.SVector{2,Float64}
+const P3 = StaticArrays.SVector{3,Float64}

 nanpush!(a::AbstractVector{P2}, b) = (push!(a, P2(NaN,NaN)); push!(a, b))
 nanappend!(a::AbstractVector{P2}, b) = (push!(a, P2(NaN,NaN)); append!(a, b))
@@ -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
@@ -187,7 +187,7 @@ end
 function scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
    sx, sy = coords(shape)
    cx, cy = c
-    for i=eachindex(sx)
+    for i=1:length(sx)
        sx[i] = (sx[i] - cx) * x + cx
        sy[i] = (sy[i] - cy) * y + cy
    end
@@ -202,7 +202,7 @@ end
 "translate a Shape in space"
 function translate!(shape::Shape, x::Real, y::Real = x)
    sx, sy = coords(shape)
-    for i=eachindex(sx)
+    for i=1:length(sx)
        sx[i] += x
        sy[i] += y
    end
@@ -230,7 +230,7 @@ end
 function rotate!(shape::Shape, Θ::Real, c = center(shape))
    x, y = coords(shape)
    cx, cy = c
-    for i=eachindex(x)
+    for i=1:length(x)
        xi = rotate_x(x[i], y[i], Θ, cx, cy)
        yi = rotate_y(x[i], y[i], Θ, cx, cy)
        x[i], y[i] = xi, yi
@@ -261,13 +261,13 @@ end
 Create a Font from a list of features. Values may be specified either as
 arguments (which are distinguished by type/value) or as keyword arguments.
 # Arguments
- `family`: AbstractString. "serif" or "sans-serif" or "monospace"
+- `family`: AbstractString. "serif" or "sans-serif" or "monospace" 
 - `pointsize`: Integer. Size of font in points
 - `halign`: Symbol. Horizontal alignment (:hcenter, :left, or :right)
 - `valign`: Symbol. Vertical aligment (:vcenter, :top, or :bottom)
 - `rotation`: Real. Angle of rotation for text in degrees (use a non-integer type)
 - `color`: Colorant or Symbol
-# Examples
+# Examples 
 ```julia-repl
 julia> font(8)
 julia> font(family="serif",halign=:center,rotation=45.0)
@@ -388,8 +388,8 @@ PlotText(str) = PlotText(string(str), font())
 """
    text(string, args...; kw...)

-Create a PlotText object wrapping a string with font info, for plot annotations.
-`args` and `kw` are passed to `font`.
+Create a PlotText object wrapping a string with font info, for plot annotations. 
+`args` and `kw` are passed to `font`. 
 """
 text(t::PlotText) = t
 text(t::PlotText, font::Font) = PlotText(t.str, font)
@@ -529,7 +529,7 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    # end

    # @show msw msh
-    if anns !== nothing && anns.baseshape !== nothing
+    if anns != nothing && anns.baseshape != nothing
        # we use baseshape to overwrite the markershape attribute
        # with a list of custom shapes for each
        msw,msh = anns.scalefactor
@@ -568,7 +568,7 @@ mutable struct EachAnn
 end

 function Base.iterate(ea::EachAnn, i = 1)
-    if ea.anns === nothing || isempty(ea.anns.strs) || i > length(ea.y)
+    if ea.anns == nothing || isempty(ea.anns.strs) || i > length(ea.y)
        return nothing
    end

@@ -591,12 +591,8 @@ annotations(sa::SeriesAnnotations) = sa
 function process_annotation(sp::Subplot, xs, ys, labs, font = font())
    anns = []
    labs = makevec(labs)
-    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
+    for i in 1:max(length(xs), length(ys), length(labs))
+        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)))
@@ -652,6 +648,23 @@ end

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

+abstract type AbstractSurface end
+
+"represents a contour or surface mesh"
+struct Surface{M<:AMat} <: AbstractSurface
+  surf::M
+end
+
+Surface(f::Function, x, y) = Surface(Float64[f(xi,yi) for yi in y, xi in x])
+
+Base.Array(surf::Surface) = surf.surf
+
+for f in (:length, :size)
+  @eval Base.$f(surf::Surface, args...) = $f(surf.surf, args...)
+end
+Base.copy(surf::Surface) = Surface(copy(surf.surf))
+Base.eltype(surf::Surface{T}) where {T} = eltype(T)
+
 function expand_extrema!(a::Axis, surf::Surface)
    ex = a[:extrema]
    for vi in surf.surf
@@ -671,7 +684,28 @@ end
 # # I don't want to clash with ValidatedNumerics, but this would be nice:
 # ..(a::T, b::T) = (a,b)

+struct Volume{T}
+    v::Array{T,3}
+    x_extents::Tuple{T,T}
+    y_extents::Tuple{T,T}
+    z_extents::Tuple{T,T}
+end

+default_extents(::Type{T}) where {T} = (zero(T), one(T))
+
+function Volume(v::Array{T,3},
+                x_extents = default_extents(T),
+                y_extents = default_extents(T),
+                z_extents = default_extents(T)) where T
+    Volume(v, x_extents, y_extents, z_extents)
+end
+
+Base.Array(vol::Volume) = vol.v
+for f in (:length, :size)
+  @eval Base.$f(vol::Volume, args...) = $f(vol.v, args...)
+end
+Base.copy(vol::Volume{T}) where {T} = Volume{T}(copy(vol.v), vol.x_extents, vol.y_extents, vol.z_extents)
+Base.eltype(vol::Volume{T}) where {T} = T

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

@@ -735,9 +769,17 @@ function add_arrows(func::Function, x::AVec, y::AVec)
    end
 end

+# -----------------------------------------------------------------------
+
+"Represents data values with formatting that should apply to the tick labels."
+struct Formatted{T}
+    data::T
+    formatter::Function
+end
+
 # -----------------------------------------------------------------------
 "create a BezierCurve for plotting"
-mutable struct BezierCurve{T <: GeometryTypes.Point}
+mutable struct BezierCurve{T <: StaticArrays.SVector}
    control_points::Vector{T}
 end

@@ -750,9 +792,12 @@ function (bc::BezierCurve)(t::Real)
    p
 end

+# mean(x::Real, y::Real) = 0.5*(x+y) #commented out as I cannot see this used anywhere and it overwrites a Base method with different functionality
+# mean{N,T<:Real}(ps::StaticArrays.SVector{N,T}...) = sum(ps) / length(ps) # I also could not see this used anywhere, and it's type piracy - implementing a NaNMath version for this would just involve converting to a standard array
+
@deprecate curve_points coords

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

 # 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]
@@ -20,10 +20,7 @@ frontends like jupyterlab and nteract.
 _ijulia__extra_mime_info!(plt::Plot, out::Dict) = out

 function _ijulia__extra_mime_info!(plt::Plot{PlotlyJSBackend}, out::Dict)
-    out["application/vnd.plotly.v1+json"] = Dict(
-        :data => plotly_series(plt),
-        :layout => plotly_layout(plt)
-    )
+    out["application/vnd.plotly.v1+json"] = JSON.lower(plt.o)
    out
 end

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

 function _plots_defaults()
    if isdefined(Main, :PLOTS_DEFAULTS)
-        copy(Dict{Symbol,Any}(Main.PLOTS_DEFAULTS))
+        Main.PLOTS_DEFAULTS::Dict{Symbol,Any}
    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())

@@ -26,53 +28,12 @@ function __init__()
        insert!(Base.Multimedia.displays, findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
    end)

-    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" begin
-        fn = joinpath(@__DIR__, "backends", "hdf5.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" begin
-        fn = joinpath(@__DIR__, "backends", "inspectdr.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" begin
-        fn = joinpath(@__DIR__, "backends", "pgfplots.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require ORCA = "47be7bcc-f1a6-5447-8b36-7eeeff7534fd" begin
-        fn = joinpath(@__DIR__, "backends", "orca.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925" begin
-        fn = joinpath(@__DIR__, "backends", "pgfplotsx.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" begin
-        fn = joinpath(@__DIR__, "backends", "plotlyjs.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" begin
-        fn = joinpath(@__DIR__, "backends", "pyplot.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
-
-    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" begin
-        fn = joinpath(@__DIR__, "backends", "unicodeplots.jl")
-        include(fn)
-        @require Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" Revise.track(Plots, fn)
-    end
+    @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" include(joinpath(@__DIR__, "backends", "hdf5.jl"))
+    @require InspectDR = "d0351b0e-4b05-5898-87b3-e2a8edfddd1d" include(joinpath(@__DIR__, "backends", "inspectdr.jl"))
+    @require PGFPlots = "3b7a836e-365b-5785-a47d-02c71176b4aa" include(joinpath(@__DIR__, "backends", "pgfplots.jl"))
+    @require PlotlyJS = "f0f68f2c-4968-5e81-91da-67840de0976a" include(joinpath(@__DIR__, "backends", "plotlyjs.jl"))
+    @require PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee" include(joinpath(@__DIR__, "backends", "pyplot.jl"))
+    @require UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" include(joinpath(@__DIR__, "backends", "unicodeplots.jl"))

    @require IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" begin
        if IJulia.inited
@@ -107,10 +107,11 @@ function resolve_mixed(mix::MixedMeasures, sp::Subplot, letter::Symbol)
    if mix.len != 0mm
        f = (letter == :x ? width : height)
        totlen = f(plotarea(sp))
+        @show totlen
        pct += mix.len / totlen
    end
    if pct != 0
-        amin, amax = axis_limits(sp, letter)
+        amin, amax = axis_limits(sp[Symbol(letter,:axis)])
        xy += pct * (amax-amin)
    end
    xy
@@ -217,7 +218,6 @@ bottompad(layout::AbstractLayout) = 0mm
 # this is the parent of the top-level layout
 struct RootLayout <: AbstractLayout end

-Base.show(io::IO, layout::RootLayout) = Base.show_default(io, layout)
 Base.parent(::RootLayout) = nothing
 parent_bbox(::RootLayout) = defaultbox
 bbox(::RootLayout) = defaultbox
@@ -464,12 +464,12 @@ end
 # constructors

 # pass the layout arg through
-function layout_args(plotattributes::AKW)
-    layout_args(plotattributes[:layout])
+function layout_args(plotattributes::KW)
+    layout_args(get(plotattributes, :layout, default(:layout)))
 end

-function layout_args(plotattributes::AKW, n_override::Integer)
-    layout, n = layout_args(n_override, get(plotattributes, :layout, n_override))
+function layout_args(plotattributes::KW, n_override::Integer)
+    layout, n = layout_args(get(plotattributes, :layout, n_override))
    if n != n_override
        error("When doing layout, n ($n) != n_override ($(n_override)).  You're probably trying to force existing plots into a layout that doesn't fit them.")
    end
@@ -481,27 +481,12 @@ function layout_args(n::Integer)
    GridLayout(nr, nc), n
 end

-function layout_args(sztup::NTuple{2, Integer})
+function layout_args(sztup::NTuple{2,I}) where I<:Integer
    nr, nc = sztup
    GridLayout(nr, nc), nr*nc
 end

-layout_args(n_override::Integer, n::Integer) = layout_args(n)
-layout_args(n, sztup::NTuple{2, Integer}) = layout_args(sztup)
-
-function layout_args(n, sztup::Tuple{Colon, Integer})
-    nc = sztup[2]
-    nr = ceil(Int, n / nc)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(n, sztup::Tuple{Integer, Colon})
-    nr = sztup[1]
-    nc = ceil(Int, n / nr)
-    GridLayout(nr, nc), n
-end
-
-function layout_args(sztup::NTuple{3, Integer})
+function layout_args(sztup::NTuple{3,I}) where I<:Integer
    n, nr, nc = sztup
    nr, nc = compute_gridsize(n, nr, nc)
    GridLayout(nr, nc), n
@@ -514,8 +499,6 @@ function layout_args(layout::GridLayout)
    layout, n
 end

-layout_args(n_override::Integer, layout::GridLayout) = layout_args(layout)
-
 layout_args(huh) = error("unhandled layout type $(typeof(huh)): $huh")


@@ -616,7 +599,7 @@ end
 # ----------------------------------------------------------------------
 # @layout macro

-function add_layout_pct!(kw::AKW, v::Expr, idx::Integer, nidx::Integer)
+function add_layout_pct!(kw::KW, v::Expr, idx::Integer, nidx::Integer)
    # dump(v)
    # something like {0.2w}?
    if v.head == :call && v.args[1] == :*
@@ -637,7 +620,7 @@ function add_layout_pct!(kw::AKW, v::Expr, idx::Integer, nidx::Integer)
    error("Couldn't match layout curly (idx=$idx): $v")
 end

-function add_layout_pct!(kw::AKW, v::Number, idx::Integer)
+function add_layout_pct!(kw::KW, v::Number, idx::Integer)
    # kw[idx == 1 ? :w : :h] = v*pct
    idx == 1 && (kw[:w] = v*pct)
    (idx == 2 || nidx == 1) && (kw[:h] = v*pct)
@@ -1,104 +1,100 @@

+
 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")
+    _use_remote[] = true
    show(io, MIME("text/html"), plt)
+    _use_remote[] = false
    close(io)
 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)
-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 +105,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))

-    # get the extension
-    fn, ext = splitext(fn)
-    ext = chop(ext, head = 1, tail = 0)
-    if isempty(ext)
-        ext = defaultOutputFormat(plt)
-    end
+  # 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

-    # 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 +148,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 +168,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 +180,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,32 +189,19 @@ 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")
    @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)
-
 # default text/plain for all backends
 _show(io::IO, ::MIME{Symbol("text/plain")}, plt::Plot) = show(io, plt)

@@ -249,36 +230,33 @@ closeall() = closeall(backend())
 # Atom PlotPane
 # ---------------------------------------------------------
 function showjuno(io::IO, m, plt)
-    sz = collect(plt[:size])
+    sz = plt[:size]
    dpi = plt[:dpi]
    thickness_scaling = plt[:thickness_scaling]

    jsize = get(io, :juno_plotsize, [400, 500])
-    jratio = get(io, :juno_dpi_ratio, 1)

    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[:size] = (s * scale for s in sz)
+    plt[:dpi] = 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
-
 _showjuno(io::IO, m, plt) = _show(io, m, plt)
@@ -1,74 +1,103 @@
-# RecipesPipeline API

-## Warnings

-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)
+# ------------------------------------------------------------------
+# preprocessing
+
+function command_idx(kw_list::AVec{KW}, kw::KW)
+    Int(kw[:series_plotindex]) - Int(kw_list[1][:series_plotindex]) + 1
+end
+
+function _expand_seriestype_array(plotattributes::KW, args)
+    sts = get(plotattributes, :seriestype, :path)
+    if typeof(sts) <: AbstractArray
+        delete!(plotattributes, :seriestype)
+        rd = Vector{RecipeData}(undef, size(sts, 1))
+        for r in 1:size(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::KW, 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)
+                if haskey(defdict, k)
+                    delete!(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
+function _process_userrecipes(plt::Plot, plotattributes::KW, args)
+    still_to_process = RecipeData[]
+    args = _preprocess_args(plotattributes, args, still_to_process)

-RecipesPipeline.splittable_attribute(plt::Plot, key, val::SeriesAnnotations, len) =
-    RecipesPipeline.splittable_attribute(plt, key, val.strs, len)
+    # for plotting recipes, swap out the args and update the parameter dictionary
+    # we are keeping a stack of series that still need to be processed.
+    # each pass through the loop, we pop one off and apply the recipe.
+    # the recipe will return a list a Series objects... the ones that are
+    # finished (no more args) get added to the kw_list, the ones that are not
+    # are placed on top of the stack and are then processed further.
+    kw_list = KW[]
+    while !isempty(still_to_process)
+        # grab the first in line to be processed and either add it to the kw_list or
+        # pass it through apply_recipe to generate a list of RecipeData objects (data + attributes)
+        # for further processing.
+        next_series = popfirst!(still_to_process)
+        # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
+        if !(typeof(next_series) <: RecipeData)
+            error("Inputs couldn't be processed... expected RecipeData but got: $next_series")
+        end
+        if isempty(next_series.args)
+            _process_userrecipe(plt, kw_list, next_series)
+        else
+            rd_list = RecipesBase.apply_recipe(next_series.plotattributes, next_series.args...)
+            prepend!(still_to_process,rd_list)
+        end
+    end

-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)
+    # don't allow something else to handle it
+    plotattributes[:smooth] = false
+    kw_list
 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
@@ -79,34 +108,35 @@ function RecipesPipeline.process_userrecipe!(plt::Plot, kw_list, kw)
    return
 end

-function _preprocess_userrecipe(kw::AKW)
+function _preprocess_userrecipe(kw::KW)
    _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
-    if get(kw, :ribbon, nothing) !== nothing
+    if get(kw, :ribbon, nothing) != nothing
        make_fillrange_from_ribbon(kw)
    end
    return
 end

-function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
+function _add_errorbar_kw(kw_list::Vector{KW}, kw::KW)
    # 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)
-        if get(kw, esym, nothing) !== nothing
+    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)
            errkw[:seriestype] = esym
@@ -117,50 +147,65 @@ function _add_errorbar_kw(kw_list::Vector{KW}, kw::AKW)
    end
 end

-function _add_smooth_kw(kw_list::Vector{KW}, kw::AKW)
+function _add_smooth_kw(kw_list::Vector{KW}, kw::KW)
    # handle smoothing by adding a new series
    if get(kw, :smooth, false)
        x, y = kw[:x], kw[:y]
        β, α = 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

+# ------------------------------------------------------------------
+# plot recipes

-RecipesPipeline.get_axis_limits(plt::Plot, f, letter) = axis_limits(plt[1], letter)
-
-
-## 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)
+# Grab the first in line to be processed and pass it through apply_recipe
+# to generate a list of RecipeData objects (data + attributes).
+# If we applied a "plot recipe" without error, then add the returned datalist's KWs,
+# otherwise we just add the original KW.
+function _process_plotrecipe(plt::Plot, kw::KW, kw_list::Vector{KW}, still_to_process::Vector{KW})
+    if !isa(get(kw, :seriestype, nothing), Symbol)
+        # seriestype was never set, or it's not a Symbol, so it can't be a plot recipe
+        push!(kw_list, kw)
+        return
+    end
+    try
+        st = kw[:seriestype]
+        st = kw[:seriestype] = get(_typeAliases, st, st)
+        datalist = RecipesBase.apply_recipe(kw, Val{st}, plt)
+        for data in datalist
+            preprocessArgs!(data.plotattributes)
+            if data.plotattributes[:seriestype] == st
+                error("Plot recipe $st returned the same seriestype: $(data.plotattributes)")
+            end
+            push!(still_to_process, data.plotattributes)
+        end
+    catch err
+        if isa(err, MethodError)
+            push!(kw_list, kw)
+        else
+            rethrow()
+        end
+    end
+    return
 end

-# TODO: Should some of this logic be moved to RecipesPipeline?
-function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+
+# ------------------------------------------------------------------
+# setup plot and subplot
+
+function _plot_setup(plt::Plot, plotattributes::KW, 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 +216,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
@@ -182,7 +227,7 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})

    # handle inset subplots
    insets = plt[:inset_subplots]
-    if insets !== nothing
+    if insets != nothing
        if !(typeof(insets) <: AVec)
            insets = [insets]
        end
@@ -196,7 +241,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)
@@ -207,39 +252,33 @@ function _plot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
    plt[:inset_subplots] = nothing
 end

-function _subplot_setup(plt::Plot, plotattributes::AKW, kw_list::Vector{KW})
+function _subplot_setup(plt::Plot, plotattributes::KW, kw_list::Vector{KW})
    # we'll keep a map of subplot to an attribute override dict.
    # 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], command_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)
-            if is_subplot_attr(k) || is_axis_attr(k)
+        for (k,v) in collect(kw)
+            if haskey(_subplot_defaults, k) || haskey(_axis_defaults_byletter, k)
                attr[k] = pop!(kw, k)
            end
-            if is_axis_attr_noletter(k)
+            if haskey(_axis_defaults, 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 +288,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 +301,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::KW) where T
    st::Symbol = plotattributes[:seriestype]
    sp::Subplot{T} = plotattributes[:subplot]
    sp_idx = get_subplot_index(plt, sp)
@@ -298,7 +312,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 +324,14 @@ function _prepare_subplot(plt::Plot{T}, plotattributes::AKW) where {T}
    sp
 end

-function _override_seriestype_check(plotattributes::AKW, st::Symbol)
+# ------------------------------------------------------------------
+# series types
+
+function _override_seriestype_check(plotattributes::KW, 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 +339,27 @@ function _override_seriestype_check(plotattributes::AKW, st::Symbol)
    st
 end

-function _expand_subplot_extrema(sp::Subplot, plotattributes::AKW, st::Symbol)
+function _prepare_annotations(sp::Subplot, plotattributes::KW)
+    # 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::KW, 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,10 +373,53 @@ 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)
    _series_added(plt, series)
 end
+
+# -------------------------------------------------------------------------------
+
+# this method recursively applies series recipes when the seriestype is not supported
+# natively by the backend
+function _process_seriesrecipe(plt::Plot, plotattributes::KW)
+    # replace seriestype aliases
+    st = Symbol(plotattributes[:seriestype])
+    st = plotattributes[:seriestype] = get(_typeAliases, st, st)
+
+    # shapes shouldn't have fillrange set
+    if plotattributes[:seriestype] == :shape
+        plotattributes[:fillrange] = nothing
+    end
+
+    # if it's natively supported, finalize processing and pass along to the backend, otherwise recurse
+    if is_seriestype_supported(st)
+        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)
+
+    else
+        # get a sub list of series for this seriestype
+        datalist = RecipesBase.apply_recipe(plotattributes, Val{st}, plotattributes[:x], plotattributes[:y], plotattributes[:z])
+
+        # assuming there was no error, recursively apply the series recipes
+        for data in datalist
+            if isa(data, RecipeData)
+                preprocessArgs!(data.plotattributes)
+                if data.plotattributes[:seriestype] == st
+                    error("The seriestype didn't change in series recipe $st.  This will cause a StackOverflow.")
+                end
+                _process_seriesrecipe(plt, data.plotattributes)
+            else
+                @warn("Unhandled recipe: $(data)")
+                break
+            end
+        end
+    end
+    nothing
+end
@@ -4,7 +4,7 @@ mutable struct CurrentPlot
 end
 const CURRENT_PLOT = CurrentPlot(nothing)

-isplotnull() = CURRENT_PLOT.nullableplot === nothing
+isplotnull() = CURRENT_PLOT.nullableplot == nothing

 """
    current()
@@ -49,7 +49,7 @@ 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()
@@ -61,7 +61,7 @@ end
 # 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
@@ -96,7 +96,7 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)

    series_attr = KW()
    for (k,v) in plotattributes
-        if is_series_attr(k)
+        if haskey(_series_defaults, k)
            series_attr[k] = pop!(plotattributes,k)
        end
    end
@@ -119,7 +119,7 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)
        sp.attr[:subplot_index] = idx
        for series in serieslist
            merge!(series.plotattributes, series_attr)
-            _slice_series_args!(series.plotattributes, plt, sp, cmdidx)
+            _add_defaults!(series.plotattributes, plt, sp, cmdidx)
            push!(plt.series_list, series)
            _series_added(plt, series)
            cmdidx += 1
@@ -153,7 +153,7 @@ 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)
 end
@@ -163,11 +163,88 @@ 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)
+function _plot!(plt::Plot, plotattributes::KW, 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
+
+    # --------------------------------
+    # "USER RECIPES"
+    # --------------------------------
+
+    kw_list = _process_userrecipes(plt, plotattributes, args)
+
+    # @info(1)
+    # map(DD, kw_list)
+
+
+    # --------------------------------
+    # "PLOT RECIPES"
+    # --------------------------------
+
+    # "plot recipe", which acts like a series type, and is processed before
+    # the plot layout is created, which allows for setting layouts and other plot-wide attributes.
+    # we get inputs which have been fully processed by "user recipes" and "type recipes",
+    # so we can expect standard vectors, surfaces, etc.  No defaults have been set yet.
+    still_to_process = kw_list
+    kw_list = KW[]
+    while !isempty(still_to_process)
+        next_kw = popfirst!(still_to_process)
+        _process_plotrecipe(plt, next_kw, kw_list, still_to_process)
+    end
+
+    # @info(2)
+    # map(DD, kw_list)
+
+    # --------------------------------
+    # Plot/Subplot/Layout setup
+    # --------------------------------
+    _plot_setup(plt, plotattributes, kw_list)
+    _subplot_setup(plt, plotattributes, kw_list)
+
+    # !!! note: At this point, kw_list is fully decomposed into individual series... one KW per series.          !!!
+    # !!!       The next step is to recursively apply series recipes until the backend supports that series type !!!
+
+    # --------------------------------
+    # "SERIES RECIPES"
+    # --------------------------------
+
+    # @info(3)
+    # map(DD, kw_list)
+
+    for kw in kw_list
+        sp::Subplot = kw[:subplot]
+        # idx = get_subplot_index(plt, sp)
+
+        # # we update subplot args in case something like the color palatte is part of the recipe
+        # _update_subplot_args(plt, sp, kw, idx, true)
+
+        # set default values, select from attribute cycles, and generally set the final attributes
+        _add_defaults!(kw, plt, sp, command_idx(kw_list,kw))
+
+        # now we have a fully specified series, with colors chosen.   we must recursively handle
+        # series recipes, which dispatch on seriestype.  If a backend does not natively support a seriestype,
+        # we check for a recipe that will convert that series type into one made up of lower-level components.
+        # For example, a histogram is just a bar plot with binned data, a bar plot is really a filled step plot,
+        # and a step plot is really just a path.  So any backend that supports drawing a path will implicitly
+        # be able to support step, bar, and histogram plots (and any recipes that use those components).
+        _process_seriesrecipe(plt, kw)
+    end
+
+    # --------------------------------
+
    current(plt)
+
+    # do we want to force display?
+    # if plt[:show]
+    #     gui(plt)
+    # end
    _do_plot_show(plt, plt[:show])
-    return plt
+
+    plt
 end


@@ -212,3 +289,5 @@ function plot!(sp::Subplot, args...; kw...)
    plt = sp.plt
    plot!(plt, args...; kw..., subplot = findfirst(isequal(sp), plt.subplots))
 end
+
+# --------------------------------------------------------------------
@@ -50,13 +50,8 @@ function plotattr(attrtype::Symbol, attribute::AbstractString)

    desc = get(_arg_desc, attribute, "")
    first_period_idx = findfirst(isequal('.'), desc)
-    if isnothing(first_period_idx) 
-        typedesc = ""
-        desc = strip(desc)
-    else
-        typedesc = desc[1:first_period_idx-1]
-        desc = strip(desc[first_period_idx+1:end])
-    end
+    typedesc = desc[1:first_period_idx-1]
+    desc = strip(desc[first_period_idx+1:end])
    als = keys(filter(x->x[2]==attribute, _keyAliases)) |> collect |> sort
    als = join(map(string,als), ", ")
    def = _attribute_defaults[attrtype][attribute]
@@ -1,740 +1,3 @@
 function _precompile_()
    ccall(:jl_generating_output, Cint, ()) == 1 || return nothing
-    isdefined(Plots, Symbol("#@layout")) && precompile(Tuple{getfield(Plots, Symbol("#@layout")), LineNumberNode, Module, Expr})
-    isdefined(Plots, Symbol("#_make_hist##kw")) && precompile(Tuple{getfield(Plots, Symbol("#_make_hist##kw")), NamedTuple{(:normed, :weights), Tuple{Bool, Array{Int64, 1}}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
-    isdefined(Plots, Symbol("#_make_hist##kw")) && precompile(Tuple{getfield(Plots, Symbol("#_make_hist##kw")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
-    isdefined(Plots, Symbol("#_make_hist##kw")) && precompile(Tuple{getfield(Plots, Symbol("#_make_hist##kw")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
-    isdefined(Plots, Symbol("#_make_hist##kw")) && precompile(Tuple{getfield(Plots, Symbol("#_make_hist##kw")), NamedTuple{(:normed, :weights), Tuple{Bool, Nothing}}, typeof(Plots._make_hist), Tuple{Array{Float64, 1}}, Symbol})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:formatter,), Tuple{Symbol}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:formatter,), Tuple{typeof(RecipesPipeline.datetimeformatter)}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:grid, :lims), Tuple{Bool, Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:grid, :lims, :flip), Tuple{Bool, Tuple{Int64, Int64}, Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:grid, :ticks), Tuple{Bool, Nothing}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:grid,), Tuple{Bool}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:gridlinewidth, :grid, :gridalpha, :gridstyle, :foreground_color_grid), Tuple{Int64, Bool, Float64, Symbol, ColorTypes.RGBA{Float64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:guide,), Tuple{String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:lims, :flip, :ticks, :guide), Tuple{Tuple{Int64, Int64}, Bool, Base.StepRange{Int64, Int64}, String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:lims,), Tuple{Tuple{Float64, Float64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Float64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:lims,), Tuple{Tuple{Int64, Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:rotation,), Tuple{Int64}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:scale, :guide), Tuple{Symbol, String}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:ticks,), Tuple{Base.UnitRange{Int64}}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#attr!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#attr!##kw")), NamedTuple{(:ticks,), Tuple{Nothing}}, typeof(Plots.attr!), Plots.Axis})
-    isdefined(Plots, Symbol("#contour##kw")) && precompile(Tuple{getfield(Plots, Symbol("#contour##kw")), NamedTuple{(:fill,), Tuple{Bool}}, typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#default##kw")) && precompile(Tuple{getfield(Plots, Symbol("#default##kw")), NamedTuple{(:titlefont, :legendfontsize, :guidefont, :tickfont, :guide, :framestyle, :yminorgrid), Tuple{Tuple{Int64, String}, Int64, Tuple{Int64, Symbol}, Tuple{Int64, Symbol}, String, Symbol, Bool}}, typeof(Plots.default)})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Array{Int64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.StepRange{Int64, Int64}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.UnitRange{Int64}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#gr_polyline##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_polyline##kw")), NamedTuple{(:arrowside, :arrowstyle), Tuple{Symbol, Symbol}}, typeof(Plots.gr_polyline), Base.UnitRange{Int64}, Base.UnitRange{Int64}})
-    isdefined(Plots, Symbol("#gr_set_font##kw")) && precompile(Tuple{getfield(Plots, Symbol("#gr_set_font##kw")), NamedTuple{(:halign, :valign, :rotation), Tuple{Symbol, Symbol, Int64}}, typeof(Plots.gr_set_font), Plots.Font})
-    isdefined(Plots, Symbol("#heatmap##kw")) && precompile(Tuple{getfield(Plots, Symbol("#heatmap##kw")), NamedTuple{(:aspect_ratio,), Tuple{Int64}}, typeof(Plots.heatmap), Array{String, 1}, Int})
-    isdefined(Plots, Symbol("#histogram##kw")) && precompile(Tuple{getfield(Plots, Symbol("#histogram##kw")), NamedTuple{(:bins, :weights), Tuple{Symbol, Array{Int64, 1}}}, typeof(Plots.histogram), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#histogram2d##kw")) && precompile(Tuple{getfield(Plots, Symbol("#histogram2d##kw")), NamedTuple{(:nbins, :show_empty_bins, :normed, :aspect_ratio), Tuple{Tuple{Int64, Int64}, Bool, Bool, Int64}}, typeof(Plots.histogram2d), Array{Base.Complex{Float64}, 1}})
-    isdefined(Plots, Symbol("#histogram2d##kw")) && precompile(Tuple{getfield(Plots, Symbol("#histogram2d##kw")), NamedTuple{(:nbins,), Tuple{Int64}}, typeof(Plots.histogram2d), Array{Float64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#hline!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#hline!##kw")), NamedTuple{(:line,), Tuple{Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}}}, typeof(Plots.hline!), Array{Float64, 2}})
-    isdefined(Plots, Symbol("#lens!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#lens!##kw")), NamedTuple{(:inset,), Tuple{Tuple{Int64, Measures.BoundingBox{Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}, Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}}}}}, typeof(Plots.lens!), Array{Int64, 1}, Int})
-    isdefined(Plots, Symbol("#pie##kw")) && precompile(Tuple{getfield(Plots, Symbol("#pie##kw")), NamedTuple{(:title, :l), Tuple{String, Float64}}, typeof(Plots.pie), Array{String, 1}, Int})
-    isdefined(Plots, Symbol("#plotly_annotation_dict##kw")) && precompile(Tuple{getfield(Plots, Symbol("#plotly_annotation_dict##kw")), NamedTuple{(:xref, :yref), Tuple{String, String}}, typeof(Plots.plotly_annotation_dict), Float64, Float64, String})
-    isdefined(Plots, Symbol("#portfoliocomposition##kw")) && precompile(Tuple{getfield(Plots, Symbol("#portfoliocomposition##kw")), NamedTuple{(:labels,), Tuple{Array{String, 2}}}, typeof(Plots.portfoliocomposition), Array{Float64, 2}, Int})
-    isdefined(Plots, Symbol("#scatter!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter!##kw")), NamedTuple{(:marker, :series_annotations), Tuple{Tuple{Int64, Float64, Symbol}, Array{Any, 1}}}, typeof(Plots.scatter!), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#scatter!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter!##kw")), NamedTuple{(:markersize, :c), Tuple{Int64, Symbol}}, typeof(Plots.scatter!), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#scatter!##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter!##kw")), NamedTuple{(:zcolor, :m, :ms, :lab), Tuple{Array{Float64, 1}, Tuple{Symbol, Float64, Plots.Stroke}, Array{Float64, 1}, String}}, typeof(Plots.scatter!), Array{Float64, 1}})
-    isdefined(Plots, Symbol("#scatter##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter##kw")), NamedTuple{(:framestyle, :title, :color, :layout, :label, :markerstrokewidth, :ticks), Tuple{Array{Symbol, 2}, Array{String, 2}, Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64, String, Int64, Base.UnitRange{Int64}}}, typeof(Plots.scatter), Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}})
-    isdefined(Plots, Symbol("#scatter##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter##kw")), NamedTuple{(:m, :lab, :bg, :xlim, :ylim), Tuple{Tuple{Int64, Symbol}, Array{String, 2}, Symbol, Tuple{Int64, Int64}, Tuple{Int64, Int64}}}, typeof(Plots.scatter), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    isdefined(Plots, Symbol("#scatter##kw")) && precompile(Tuple{getfield(Plots, Symbol("#scatter##kw")), NamedTuple{(:marker_z, :color, :legend), Tuple{typeof(Base.:+), Symbol, Bool}}, typeof(Plots.scatter), Array{Float64, 1}, Array{Float64, 1}})
-    isdefined(Plots, Symbol("#standalone_html##kw")) && precompile(Tuple{getfield(Plots, Symbol("#standalone_html##kw")), NamedTuple{(:title,), Tuple{String}}, typeof(Plots.standalone_html), Plots.Plot{Plots.PlotlyBackend}})
-    isdefined(Plots, Symbol("#test_examples##kw")) && precompile(Tuple{getfield(Plots, Symbol("#test_examples##kw")), NamedTuple{(:skip,), Tuple{Array{Int64, 1}}}, typeof(Plots.test_examples), Symbol})
-    precompile(Tuple{typeof(Plots.__init__)})
-    precompile(Tuple{typeof(Plots._add_errorbar_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_markershape), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_smooth_kw), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._add_the_series), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._backend_instance), Symbol})
-    precompile(Tuple{typeof(Plots._bin_centers), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._binbarlike_baseline), Float64, Symbol})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, 1}, String})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{Int64, 1}, String})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{Nothing, 1}, String})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{PlotUtils.ColorGradient, 1}, String})
-    precompile(Tuple{typeof(Plots._cbar_unique), Array{Symbol, 1}, String})
-    precompile(Tuple{typeof(Plots._create_backend_figure), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._create_backend_figure), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Any, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Array{Float64, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{Plots.Subplot{T} where T<:RecipesBase.AbstractBackend, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Array{String, 1}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Base.OneTo{Int64}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Base.StepRange{Int64, Int64}, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Base.StepRange{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), ColorTypes.RGBA{Float64}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Float64, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Int64, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Int64, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Nothing, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots._cycle), Nothing, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots._cycle), Nothing, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Plots.Shape, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Plots.Subplot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Plots.Subplot{Plots.PlotlyBackend}, Int64})
-    precompile(Tuple{typeof(Plots._cycle), Symbol, Int64})
-    precompile(Tuple{typeof(Plots._display), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Bool})
-    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots._do_plot_show), Plots.Plot{Plots.PlotlyBackend}, Bool})
-    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.GRBackend}, RecipesPipeline.DefaultsDict, Symbol})
-    precompile(Tuple{typeof(Plots._expand_subplot_extrema), Plots.Subplot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict, Symbol})
-    precompile(Tuple{typeof(Plots._heatmap_edges), Array{Float64, 1}, Bool})
-    precompile(Tuple{typeof(Plots._hist_edge), Tuple{Array{Float64, 1}}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Int64})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}, Array{Float64, 1}}, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._hist_edges), Tuple{Array{Float64, 1}}, Symbol})
-    precompile(Tuple{typeof(Plots._initialize_backend), Plots.PlotlyBackend})
-    precompile(Tuple{typeof(Plots._override_seriestype_check), RecipesPipeline.DefaultsDict, Symbol})
-    precompile(Tuple{typeof(Plots._pick_default_backend)})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Dates.DateTime, 1}, Base.UnitRange{Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}, Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Float64, Float64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Int64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Tuple{Int64, Real}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{typeof(Base.log), Int64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{Float64, 1}, 1}, Array{Array{Float64, 1}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Array{T, 1} where T, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Base.Complex{Float64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Dates.DateTime, 1}, Base.UnitRange{Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Function, 1}, Float64, Float64}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Int64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Plots.OHLC{T} where T<:Real, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{String, 1}, Array{String, 1}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Tuple{Int64, Real}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Array{Union{Base.Missing, Int64}, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Base.StepRange{Int64, Int64}, Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Base.UnitRange{Int64}}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.PortfolioComposition}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{Plots.Spy}})
-    precompile(Tuple{typeof(Plots._plot!), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Tuple{}})
-    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._plot_setup), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._plotly_framestyle), Symbol})
-    precompile(Tuple{typeof(Plots._plots_defaults)})
-    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.GRBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._prepare_subplot), Plots.Plot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), RecipesPipeline.DefaultsDict, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), RecipesPipeline.DefaultsDict, Array{Int64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_barlike), RecipesPipeline.DefaultsDict, Base.OneTo{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_binlike), RecipesPipeline.DefaultsDict, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots._preprocess_userrecipe), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._replace_linewidth), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._replace_markershape), Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots._replace_markershape), Plots.Shape})
-    precompile(Tuple{typeof(Plots._scale_adjusted_values), Type{Float64}, Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots._series_index), RecipesPipeline.DefaultsDict, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._series_index), RecipesPipeline.DefaultsDict, Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots._show), Base.IOStream, Base.Multimedia.MIME{Symbol("image/png")}, Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._slice_series_args!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots._slice_series_args!), Base.Dict{Symbol, Any}, Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, Int64})
-    precompile(Tuple{typeof(Plots._slice_series_args!), RecipesPipeline.DefaultsDict, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Int64})
-    precompile(Tuple{typeof(Plots._slice_series_args!), RecipesPipeline.DefaultsDict, Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, Int64})
-    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._subplot_setup), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Array{Base.Dict{Symbol, Any}, 1}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots._transform_ticks), Nothing})
-    precompile(Tuple{typeof(Plots._transform_ticks), Symbol})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Axis, RecipesPipeline.DefaultsDict, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, RecipesPipeline.DefaultsDict, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict, Symbol, Int64})
-    precompile(Tuple{typeof(Plots._update_axis_colors), Plots.Axis})
-    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.GRBackend}, Plots.Axis, Symbol})
-    precompile(Tuple{typeof(Plots._update_axis_links), Plots.Plot{Plots.PlotlyBackend}, Plots.Axis, Symbol})
-    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots._update_clims), Float64, Float64, Int64, Int64})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_min_padding!), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.GRBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots._update_plot_args), Plots.Plot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots._update_series_attributes!), RecipesPipeline.DefaultsDict, Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_series_attributes!), RecipesPipeline.DefaultsDict, Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}, RecipesPipeline.DefaultsDict, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, Base.Dict{Symbol, Any}, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_args), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict, Int64, Bool})
-    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_colors), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.GRBackend}, Array{Any, 1}})
-    precompile(Tuple{typeof(Plots._update_subplot_periphery), Plots.Subplot{Plots.PlotlyBackend}, Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.addExtension), String, String})
-    precompile(Tuple{typeof(Plots.add_layout_pct!), Base.Dict{Symbol, Any}, Expr, Int64, Int64})
-    precompile(Tuple{typeof(Plots.aliasesAndAutopick), RecipesPipeline.DefaultsDict, Symbol, Base.Dict{Symbol, Symbol}, Array{Symbol, 1}, Int64})
-    precompile(Tuple{typeof(Plots.allAlphas), Int64})
-    precompile(Tuple{typeof(Plots.allStyles), Int64})
-    precompile(Tuple{typeof(Plots.allStyles), Symbol})
-    precompile(Tuple{typeof(Plots.annotate!), Array{Tuple{Int64, Float64, Plots.PlotText}, 1}})
-    precompile(Tuple{typeof(Plots.arrow), Int64})
-    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.attr), Plots.EmptyLayout, Symbol})
-    precompile(Tuple{typeof(Plots.autopick), Array{ColorTypes.RGBA{Float64}, 1}, Int64})
-    precompile(Tuple{typeof(Plots.autopick_ignore_none_auto), Array{Symbol, 1}, Int64})
-    precompile(Tuple{typeof(Plots.axis_drawing_info), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.axis_drawing_info_3d), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol, Bool, Bool})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.PlotlyBackend}, Symbol, Bool, Bool})
-    precompile(Tuple{typeof(Plots.axis_limits), Plots.Subplot{Plots.PlotlyBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.backend), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.backend), Plots.PlotlyBackend})
-    precompile(Tuple{typeof(Plots.backend), Symbol})
-    precompile(Tuple{typeof(Plots.backend)})
-    precompile(Tuple{typeof(Plots.bar), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.bbox!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bbox!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bbox!), Plots.Subplot{Plots.PlotlyBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bbox), Float64, Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.bbox), Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}})
-    precompile(Tuple{typeof(Plots.bbox_to_pcts), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Bool})
-    precompile(Tuple{typeof(Plots.bbox_to_pcts), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}})
-    precompile(Tuple{typeof(Plots.bottom), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.bottom), Measures.BoundingBox{Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}, Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}}})
-    precompile(Tuple{typeof(Plots.bottompad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.bottompad), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64, Array{Plots.Plot{T} where T<:RecipesBase.AbstractBackend, 1}})
-    precompile(Tuple{typeof(Plots.build_layout), Plots.GridLayout, Int64})
-    precompile(Tuple{typeof(Plots.build_layout), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.EmptyLayout})
-    precompile(Tuple{typeof(Plots.calc_num_subplots), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.color_or_nothing!), RecipesPipeline.DefaultsDict, Symbol})
-    precompile(Tuple{typeof(Plots.colorbar_style), Plots.Series})
-    precompile(Tuple{typeof(Plots.compute_gridsize), Int64, Int64, Int64})
-    precompile(Tuple{typeof(Plots.concatenate_fillrange), Base.UnitRange{Int64}, Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots.contour), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Int})
-    precompile(Tuple{typeof(Plots.contour_levels), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.convertLegendValue), Bool})
-    precompile(Tuple{typeof(Plots.convertLegendValue), Symbol})
-    precompile(Tuple{typeof(Plots.convert_sci_unicode), String})
-    precompile(Tuple{typeof(Plots.convert_to_polar), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}, Tuple{Int64, Float64}})
-    precompile(Tuple{typeof(Plots.copy_series!), Plots.Series, Symbol})
-    precompile(Tuple{typeof(Plots.create_grid), Expr})
-    precompile(Tuple{typeof(Plots.create_grid), Symbol})
-    precompile(Tuple{typeof(Plots.create_grid_curly), Expr})
-    precompile(Tuple{typeof(Plots.create_grid_vcat), Expr})
-    precompile(Tuple{typeof(Plots.default), Symbol, Bool})
-    precompile(Tuple{typeof(Plots.default), Symbol, Int64})
-    precompile(Tuple{typeof(Plots.default), Symbol, String})
-    precompile(Tuple{typeof(Plots.default), Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.default), Symbol})
-    precompile(Tuple{typeof(Plots.default_should_widen), Plots.Axis})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{String, 1}})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Array{Union{Base.Missing, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Base.Missing})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, Char})
-    precompile(Tuple{typeof(Plots.discrete_value!), Plots.Axis, String})
-    precompile(Tuple{typeof(Plots.ensure_gradient!), RecipesPipeline.DefaultsDict, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.error_coords), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.error_coords), Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.error_style!), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.error_zipit), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Float64})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Int64})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, RecipesPipeline.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Axis, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.GRBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.expand_extrema!), Plots.Subplot{Plots.PlotlyBackend}, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.extend_by_data!), Array{Float64, 1}, Float64})
-    precompile(Tuple{typeof(Plots.extend_series_data!), Plots.Series, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.fakedata), Int64, Int64})
-    precompile(Tuple{typeof(Plots.fg_color), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.font), Int64, Int})
-    precompile(Tuple{typeof(Plots.font), String, Int})
-    precompile(Tuple{typeof(Plots.font), Symbol, Int})
-    precompile(Tuple{typeof(Plots.frame), Plots.Animation, Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.frame), Plots.Animation})
-    precompile(Tuple{typeof(Plots.get_aspect_ratio), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.get_aspect_ratio), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.get_axis), Plots.Subplot{Plots.PlotlyBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.PlotlyBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.get_clims), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_fillalpha), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.get_fillcolor), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.get_linealpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_linealpha), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.get_linecolor), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.get_linestyle), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_linestyle), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_linewidth), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_linewidth), Plots.Series})
-    precompile(Tuple{typeof(Plots.get_markeralpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markercolor), Plots.Series, Float64, Float64, Int64})
-    precompile(Tuple{typeof(Plots.get_markerstrokealpha), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markerstrokecolor), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_markerstrokewidth), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{Any, 1}}})
-    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Float64, 1}, Array{String, 1}}})
-    precompile(Tuple{typeof(Plots.get_minor_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Tuple{Array{Int64, 1}, Array{String, 1}}})
-    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), ColorTypes.RGBA{Float64}, Plots.Subplot{Plots.PlotlyBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Int64, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Int64, Plots.Subplot{Plots.PlotlyBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), PlotUtils.ColorGradient, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), PlotUtils.ColorGradient, Plots.Subplot{Plots.PlotlyBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.GRBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_series_color), Symbol, Plots.Subplot{Plots.PlotlyBackend}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.get_subplot), Plots.Plot{Plots.GRBackend}, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.get_subplot), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.get_ticks), Plots.Subplot{Plots.PlotlyBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.get_xy), Array{Plots.OHLC{T} where T<:Real, 1}, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.get_xy), Plots.OHLC{Float64}, Int64, Float64})
-    precompile(Tuple{typeof(Plots.gr_axis_height), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.gr_axis_width), Plots.Subplot{Plots.GRBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.gr_color), ColorTypes.RGBA{Float64}, Type{ColorTypes.RGB{Float64}}})
-    precompile(Tuple{typeof(Plots.gr_colorbar_colors), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_contour_levels), Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_display), Plots.Plot{Plots.GRBackend}, String})
-    precompile(Tuple{typeof(Plots.gr_display), Plots.Subplot{Plots.GRBackend}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_draw_colorbar), Plots.GRColorbar, Plots.Subplot{Plots.GRBackend}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Float64, Float64, Tuple{Float64, Float64}, Int64, Int64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Float64, Float64, Tuple{Float64, Float64}, Int64, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Float64, Tuple{Float64, Float64}, Int64, Float64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Float64, Tuple{Float64, Float64}, Int64, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Float64, Tuple{Float64, Float64}, Int64, Int64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Float64, Tuple{Float64, Float64}, Int64, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Int64, Tuple{Float64, Float64}, Int64, Int64, Plots.Shape})
-    precompile(Tuple{typeof(Plots.gr_draw_marker), Plots.Series, Int64, Int64, Tuple{Float64, Float64}, Int64, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Int64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Array{Int64, 1}, Array{Int64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.OneTo{Int64}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.gr_draw_markers), Plots.Series, Float64, Float64, Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_fill_viewport), Array{Float64, 1}, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_get_color), Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{Any, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Float64, 1}, Array{String, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.gr_get_ticks_size), Tuple{Array{Int64, 1}, Array{String, 1}}, Int64})
-    precompile(Tuple{typeof(Plots.gr_inqtext), Int64, Int64, String})
-    precompile(Tuple{typeof(Plots.gr_legend_pos), Plots.Subplot{Plots.GRBackend}, Float64, Float64})
-    precompile(Tuple{typeof(Plots.gr_polaraxes), Int64, Float64, Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}, typeof(identity)})
-    precompile(Tuple{typeof(Plots.gr_polyline), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_set_bordercolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_fill), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_fillcolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_font), Plots.Font})
-    precompile(Tuple{typeof(Plots.gr_set_gradient), PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_gradient), Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_set_line), Float64, Symbol, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_line), Int64, Symbol, PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_linecolor), PlotUtils.ColorGradient})
-    precompile(Tuple{typeof(Plots.gr_set_markercolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_textcolor), ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Float64})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Int64})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), ColorTypes.RGBA{Float64}, Nothing})
-    precompile(Tuple{typeof(Plots.gr_set_transparency), Float64})
-    precompile(Tuple{typeof(Plots.gr_set_viewport_cmap), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_viewport_polar)})
-    precompile(Tuple{typeof(Plots.gr_set_xticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_set_yticks_font), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gr_text), Float64, Float64, String})
-    precompile(Tuple{typeof(Plots.gr_text_size), String, Int64})
-    precompile(Tuple{typeof(Plots.gr_text_size), String})
-    precompile(Tuple{typeof(Plots.gr_tick_label), Plots.Axis, String})
-    precompile(Tuple{typeof(Plots.gr_update_colorbar!), Plots.GRColorbar, Plots.Series})
-    precompile(Tuple{typeof(Plots.gr_viewport_from_bbox), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.gr_w3tondc), Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.gr_w3tondc), Int64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.gui), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.gui), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.guide_padding), Plots.Axis})
-    precompile(Tuple{typeof(Plots.guidefont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Array{Symbol, 2}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Plots.Shape, Symbol})
-    precompile(Tuple{typeof(Plots.handleColors!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.has_attribute_segments), Plots.Series})
-    precompile(Tuple{typeof(Plots.hascolorbar), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.hascolorbar), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.hasgrid), Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap), Array{Dates.DateTime, 1}, Int})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Array{Float64, 1}, Symbol, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Base.UnitRange{Int64}, Symbol, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Symbol})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.UnitRange{Int64}, Symbol, Bool})
-    precompile(Tuple{typeof(Plots.heatmap_edges), Base.UnitRange{Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Array{Float64, 2}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.ignorenan_extrema), Plots.Axis})
-    precompile(Tuple{typeof(Plots.ignorenan_maximum), Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.ignorenan_minimum), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.ignorenan_minimum), Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.inline), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.inline), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.intersection_point), Float64, Float64, Float64, Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.is_2tuple), Int64})
-    precompile(Tuple{typeof(Plots.is_2tuple), Symbol})
-    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Array{Float64, 1}, Array{Float64, 1}}})
-    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Int64, Float64}})
-    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.is_2tuple), Tuple{Int64, Measures.BoundingBox{Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}, Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}}}})
-    precompile(Tuple{typeof(Plots.is_axis_attr), Symbol})
-    precompile(Tuple{typeof(Plots.is_axis_attr_noletter), Symbol})
-    precompile(Tuple{typeof(Plots.is_default_attribute), Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.PlotlyBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.Shape})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Plots.Stroke})
-    precompile(Tuple{typeof(Plots.is_marker_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_scale_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_scale_supported), Plots.PlotlyBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_series_attr), Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Plots.PlotlyBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_seriestype_supported), Symbol})
-    precompile(Tuple{typeof(Plots.is_style_supported), Plots.GRBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_style_supported), Plots.PlotlyBackend, Symbol})
-    precompile(Tuple{typeof(Plots.is_subplot_attr), Symbol})
-    precompile(Tuple{typeof(Plots.is_uniformly_spaced), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iscontour), Plots.Series})
-    precompile(Tuple{typeof(Plots.isijulia)})
-    precompile(Tuple{typeof(Plots.ispolar), Plots.Series})
-    precompile(Tuple{typeof(Plots.ispolar), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.ispolar), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.isvertical), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.isvertical), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.iter_segments), Array{Float64, 1}, Array{Float64, 1}, Int})
-    precompile(Tuple{typeof(Plots.iter_segments), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Array{Int64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.OneTo{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.OneTo{Int64}, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.StepRange{Int64, Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Base.UnitRange{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.iter_segments), Plots.Series})
-    precompile(Tuple{typeof(Plots.labelfunc), Symbol, Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.labelfunc), Symbol, Plots.PlotlyBackend})
-    precompile(Tuple{typeof(Plots.layout_args), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Int64, Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Int64, Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.layout_args), Int64, Tuple{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.layout_args), Int64})
-    precompile(Tuple{typeof(Plots.layout_args), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.layout_args), RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.left), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.left), Measures.BoundingBox{Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}, Tuple{Measures.Length{:w, Float64}, Measures.Length{:h, Float64}}}})
-    precompile(Tuple{typeof(Plots.leftpad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.leftpad), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.legendfont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.legendfont), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.legendtitlefont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.like_histogram), Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Array{RecipesBase.AbstractLayout, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis, Plots.Axis})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Axis})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.GridLayout, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Subplot{Plots.GRBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.link_axes!), Plots.Subplot{Plots.PlotlyBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.link_subplots), Array{RecipesBase.AbstractLayout, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.locate_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.make_fillrange_from_ribbon), Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Base.UnitRange{Int64}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Base.UnitRange{Int64}, Base.LinRange{Float64}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Base.UnitRange{Int64}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.make_fillrange_side), Base.UnitRange{Int64}, Int64})
-    precompile(Tuple{typeof(Plots.make_steps), Array{Float64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Array{Int64, 1}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Base.OneTo{Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.make_steps), Nothing, Symbol})
-    precompile(Tuple{typeof(Plots.nanappend!), Array{Float64, 1}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.ohlc), Array{Plots.OHLC{T} where T<:Real, 1}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.GRBackend}, Plots.Axis, Nothing})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.PlotlyBackend}, Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.optimal_ticks_and_labels), Plots.Subplot{Plots.PlotlyBackend}, Plots.Axis, Nothing})
-    precompile(Tuple{typeof(Plots.parse_axis_kw), Symbol})
-    precompile(Tuple{typeof(Plots.pie_labels), Plots.Subplot{Plots.GRBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.pie_labels), Plots.Subplot{Plots.PlotlyBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.plotarea!), Plots.GridLayout, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.plotarea!), Plots.Subplot{Plots.GRBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.plotarea!), Plots.Subplot{Plots.PlotlyBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.plotarea), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.plotarea), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_annotation_dict), Float64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.plotly_apply_aspect_ratio), Plots.Subplot{Plots.PlotlyBackend}, Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_axis), Plots.Plot{Plots.PlotlyBackend}, Plots.Axis, Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_colorbar_hack), Plots.Series, Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.plotly_colorscale), PlotUtils.ColorGradient, Nothing})
-    precompile(Tuple{typeof(Plots.plotly_data), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Array{String, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Array{String, 1}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, Nothing})
-    precompile(Tuple{typeof(Plots.plotly_data), Plots.Series, Symbol, RecipesPipeline.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.plotly_domain), Plots.Subplot{Plots.PlotlyBackend}, Symbol})
-    precompile(Tuple{typeof(Plots.plotly_font), Plots.Font, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.plotly_font), Plots.Font})
-    precompile(Tuple{typeof(Plots.plotly_hover!), Base.Dict{Symbol, Any}, Array{Nothing, 1}})
-    precompile(Tuple{typeof(Plots.plotly_hover!), Base.Dict{Symbol, Any}, Nothing})
-    precompile(Tuple{typeof(Plots.plotly_html_body), Plots.Plot{Plots.PlotlyBackend}, Nothing})
-    precompile(Tuple{typeof(Plots.plotly_html_head), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_layout), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_legend_pos), Symbol})
-    precompile(Tuple{typeof(Plots.plotly_link_indicies), Plots.Plot{Plots.PlotlyBackend}, Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Array{Float64, 2}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Array{String, 1}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Base.OneTo{Int64}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Base.StepRange{Int64, Int64}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, Base.UnitRange{Int64}})
-    precompile(Tuple{typeof(Plots.plotly_native_data), Plots.Axis, RecipesPipeline.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.plotly_polar!), Base.Dict{Symbol, Any}, Plots.Series})
-    precompile(Tuple{typeof(Plots.plotly_polaraxis), Plots.Subplot{Plots.PlotlyBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.plotly_series), Plots.Plot{Plots.PlotlyBackend}, Plots.Series})
-    precompile(Tuple{typeof(Plots.plotly_series), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Array{Float64, 1}, Array{Float64, 1}, Array{Float64, 1}, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Array{Float64, 1}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Array{Int64, 1}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Array{Int64, 1}, Array{Int64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Base.OneTo{Int64}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Base.OneTo{Int64}, Base.UnitRange{Int64}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Base.StepRange{Int64, Int64}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Base.UnitRange{Int64}, Array{Float64, 1}, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_segments), Plots.Series, Base.Dict{Symbol, Any}, Nothing, Nothing, Nothing, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_series_shapes), Plots.Plot{Plots.PlotlyBackend}, Plots.Series, Tuple{Float64, Float64}})
-    precompile(Tuple{typeof(Plots.plotly_surface_data), Plots.Series, RecipesPipeline.Surface{Array{Float64, 2}}})
-    precompile(Tuple{typeof(Plots.png), Plots.Plot{Plots.GRBackend}, String})
-    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.prepare_output), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Bool})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processFillArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processFontArg!), Base.Dict{Symbol, Any}, Symbol, Int64})
-    precompile(Tuple{typeof(Plots.processFontArg!), Base.Dict{Symbol, Any}, Symbol, String})
-    precompile(Tuple{typeof(Plots.processFontArg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Bool, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Int64, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.processGridArg!), RecipesPipeline.DefaultsDict, Bool, Symbol})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processLineArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Array{Symbol, 2}})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Bool})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, ColorTypes.RGBA{Float64}})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Float64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Int64})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Shape})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Plots.Stroke})
-    precompile(Tuple{typeof(Plots.processMarkerArg), Base.Dict{Symbol, Any}, Symbol})
-    precompile(Tuple{typeof(Plots.processMinorGridArg!), Base.Dict{Symbol, Any}, Bool, Symbol})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText, Plots.Font})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.GRBackend}, Int64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.PlotlyBackend}, Int64, Float64, Plots.PlotText, Plots.Font})
-    precompile(Tuple{typeof(Plots.process_annotation), Plots.Subplot{Plots.PlotlyBackend}, Int64, Float64, Plots.PlotText})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Base.StepRange{Int64, Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, String, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.process_axis_arg!), Base.Dict{Symbol, Any}, Tuple{Int64, Int64}, Symbol})
-    precompile(Tuple{typeof(Plots.recompute_lengths), Array{Measures.Measure, 1}})
-    precompile(Tuple{typeof(Plots.replaceAlias!), Base.Dict{Symbol, Any}, Symbol, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAlias!), RecipesPipeline.DefaultsDict, Symbol, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAliases!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.replaceAliases!), RecipesPipeline.DefaultsDict, Base.Dict{Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.reset_axis_defaults_byletter!)})
-    precompile(Tuple{typeof(Plots.right), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.rightpad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.rightpad), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.rowsize), Expr})
-    precompile(Tuple{typeof(Plots.rowsize), Symbol})
-    precompile(Tuple{typeof(Plots.series_annotations), Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.series_annotations), Plots.SeriesAnnotations})
-    precompile(Tuple{typeof(Plots.series_annotations_shapes!), Plots.Series, Symbol})
-    precompile(Tuple{typeof(Plots.series_idx), Array{Base.Dict{Symbol, Any}, 1}, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.shape_data), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.should_add_to_legend), Plots.Series})
-    precompile(Tuple{typeof(Plots.showaxis), Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.shrink_by), Float64, Float64, Float64})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, Base.Dict{Symbol, Any}, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), Base.Dict{Symbol, Any}, RecipesPipeline.DefaultsDict, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg!), RecipesPipeline.DefaultsDict, RecipesPipeline.DefaultsDict, Symbol, Int64, Bool})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{ColorTypes.RGBA{Float64}, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{Float64, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{Measures.Length{:mm, Float64}, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{String, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Array{Symbol, 2}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.ReshapedArray{Int64, 2, Base.UnitRange{Int64}, Tuple{}}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.StepRange{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Base.UnitRange{Int64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Bool, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), ColorTypes.RGBA{Float64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Float64, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Int64, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Nothing, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), String, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Symbol, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Float64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Float64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), Tuple{Int64, Int64}, Int64})
-    precompile(Tuple{typeof(Plots.slice_arg), typeof(identity), Int64})
-    precompile(Tuple{typeof(Plots.straightline_data), Plots.Series, Int64})
-    precompile(Tuple{typeof(Plots.straightline_data), Tuple{Int64, Int64}, Tuple{Float64, Float64}, Array{Float64, 1}, Array{Float64, 1}, Int64})
-    precompile(Tuple{typeof(Plots.stroke), Int64, Int})
-    precompile(Tuple{typeof(Plots.supported_markers), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.supported_markers), Plots.PlotlyBackend})
-    precompile(Tuple{typeof(Plots.supported_markers)})
-    precompile(Tuple{typeof(Plots.supported_styles), Plots.GRBackend})
-    precompile(Tuple{typeof(Plots.supported_styles), Plots.PlotlyBackend})
-    precompile(Tuple{typeof(Plots.supported_styles)})
-    precompile(Tuple{typeof(Plots.test_examples), Symbol})
-    precompile(Tuple{typeof(Plots.text), String, Int64, Symbol, Symbol})
-    precompile(Tuple{typeof(Plots.text), String, Plots.Font})
-    precompile(Tuple{typeof(Plots.text), String, Symbol, Int64, Int})
-    precompile(Tuple{typeof(Plots.text), String, Symbol})
-    precompile(Tuple{typeof(Plots.text_size), Int64, Int64, Int64})
-    precompile(Tuple{typeof(Plots.tick_padding), Plots.Subplot{Plots.PlotlyBackend}, Plots.Axis})
-    precompile(Tuple{typeof(Plots.tickfont), Plots.Axis})
-    precompile(Tuple{typeof(Plots.title!), String})
-    precompile(Tuple{typeof(Plots.title_padding), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.titlefont), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.top), Measures.BoundingBox{Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}, Tuple{Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}}}})
-    precompile(Tuple{typeof(Plots.toppad), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.toppad), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.transpose_z), Plots.Series, Array{Float64, 2}, Bool})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.GridLayout})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.Subplot{Plots.GRBackend}, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_child_bboxes!), Plots.Subplot{Plots.PlotlyBackend}, Array{Measures.Length{:mm, Float64}, 1}})
-    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.update_inset_bboxes!), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.vline!), Array{Int64, 1}})
-    precompile(Tuple{typeof(Plots.wand_edges), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported), Plots.GRBackend, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported), Plots.PlotlyBackend, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported_args), Plots.GRBackend, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported_args), Plots.PlotlyBackend, RecipesPipeline.DefaultsDict})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported_scales), Plots.GRBackend, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.warn_on_unsupported_scales), Plots.PlotlyBackend, Base.Dict{Symbol, Any}})
-    precompile(Tuple{typeof(Plots.widen), Float64, Float64, Symbol})
-    precompile(Tuple{typeof(Plots.wraptuple), Array{Any, 1}})
-    precompile(Tuple{typeof(Plots.wraptuple), Array{Float64, 1}})
-    precompile(Tuple{typeof(Plots.wraptuple), Base.StepRangeLen{Float64, Base.TwicePrecision{Float64}, Base.TwicePrecision{Float64}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Bool})
-    precompile(Tuple{typeof(Plots.wraptuple), Float64})
-    precompile(Tuple{typeof(Plots.wraptuple), Int64})
-    precompile(Tuple{typeof(Plots.wraptuple), Nothing})
-    precompile(Tuple{typeof(Plots.wraptuple), Plots.SeriesAnnotations})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64, Float64, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Array{Symbol, 2}, Int64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Base.LinRange{Float64}, Base.LinRange{Float64}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Array{Symbol, 2}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Float64, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, String}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Float64, Array{Symbol, 2}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Int64, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Plots.Shape, Int64, ColorTypes.RGBA{Float64}}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{String, Tuple{Int64, Int64}, Base.StepRange{Int64, Int64}, Symbol}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Float64, Plots.Stroke}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Int64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Symbol, Int64, Symbol, Float64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{Symbol, Symbol, Symbol, Int64, Float64}})
-    precompile(Tuple{typeof(Plots.wraptuple), Tuple{}})
-    precompile(Tuple{typeof(Plots.write_temp_html), Plots.Plot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.xgrid!), Plots.Plot{Plots.GRBackend}, Symbol, Int})
-    precompile(Tuple{typeof(Plots.xgrid!), Plots.Plot{Plots.PlotlyBackend}, Symbol, Int})
-    precompile(Tuple{typeof(Plots.xlims), Int64})
-    precompile(Tuple{typeof(Plots.xlims), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.xlims), Plots.Subplot{Plots.PlotlyBackend}})
-    precompile(Tuple{typeof(Plots.xy_mm_to_pcts), Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}, Measures.Length{:mm, Float64}})
-    precompile(Tuple{typeof(Plots.yaxis!), String, Symbol})
-    precompile(Tuple{typeof(Plots.ylims), Int64})
-    precompile(Tuple{typeof(Plots.ylims), Plots.Subplot{Plots.GRBackend}})
-    precompile(Tuple{typeof(Plots.ylims), Plots.Subplot{Plots.PlotlyBackend}})
 end
@@ -0,0 +1,671 @@
+
+
+# create a new "build_series_args" which converts all inputs into xs = Any[xitems], ys = Any[yitems].
+# Special handling for: no args, xmin/xmax, parametric, dataframes
+# Then once inputs have been converted, build the series args, map functions, etc.
+# This should cut down on boilerplate code and allow more focused dispatch on type
+# note: returns meta information... mainly for use with automatic labeling from DataFrames for now
+
+const FuncOrFuncs{F} = Union{F, Vector{F}, Matrix{F}}
+
+all3D(plotattributes::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image, :plots_heatmap), get(plotattributes, :seriestype, :none))
+
+# unknown
+convertToAnyVector(x, plotattributes::KW) = error("No user recipe defined for $(typeof(x))")
+
+# missing
+convertToAnyVector(v::Nothing, plotattributes::KW) = Any[nothing], nothing
+
+# fixed number of blank series
+convertToAnyVector(n::Integer, plotattributes::KW) = Any[zeros(0) for i in 1:n], nothing
+
+# numeric vector
+convertToAnyVector(v::AVec{T}, plotattributes::KW) where {T<:Number} = Any[v], nothing
+convertToAnyVector(v::AVec{Union{Missing, T}}, plotattributes::KW) where {T<:Number} = Any[replace(v, missing => NaN)], nothing
+
+# string vector
+convertToAnyVector(v::AVec{T}, plotattributes::KW) where {T<:AbstractString} = Any[v], nothing
+convertToAnyVector(v::AVec{Union{Missing, T}}, plotattributes::KW) where {T<:AbstractString} = Any[replace(v, missing => "")], nothing
+
+function convertToAnyVector(v::AMat, plotattributes::KW)
+    v = handlemissings(v)
+    if all3D(plotattributes)
+        Any[Surface(v)]
+    else
+        Any[v[:,i] for i in 1:size(v,2)]
+    end, nothing
+end
+
+handlemissings(v::AMat) = v
+handlemissings(v::AMat{T}) where T <: Number = replace(v, missing => NaN)
+handlemissings(v::AMat{T}) where T <: String = replace(v, missing => "")
+
+# function
+convertToAnyVector(f::Function, plotattributes::KW) = Any[f], nothing
+
+# surface
+convertToAnyVector(s::Surface, plotattributes::KW) = Any[s], nothing
+
+# volume
+convertToAnyVector(v::Volume, plotattributes::KW) = Any[v], nothing
+
+# # vector of OHLC
+# convertToAnyVector(v::AVec{OHLC}, plotattributes::KW) = Any[v], nothing
+
+# # dates
+convertToAnyVector(dts::AVec{D}, plotattributes::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing
+
+# list of things (maybe other vectors, functions, or something else)
+function convertToAnyVector(v::AVec, plotattributes::KW)
+    if all(x -> typeof(x) <: Number, v)
+        # all real numbers wrap the whole vector as one item
+        Any[convert(Vector{Float64}, v)], nothing
+    else
+        # something else... treat each element as an item
+        vcat(Any[convertToAnyVector(vi, plotattributes)[1] for vi in v]...), nothing
+        # Any[vi for vi in v], nothing
+    end
+end
+
+convertToAnyVector(t::Tuple, plotattributes::KW) = Any[t], nothing
+
+
+function convertToAnyVector(args...)
+    error("In convertToAnyVector, could not handle the argument types: $(map(typeof, args[1:end-1]))")
+end
+
+# --------------------------------------------------------------------
+
+# 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)      = 1:size(z,1)
+compute_x(x::Nothing, y, z)            = 1:size(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)      = 1:size(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
+
+# ensure we dispatch to the slicer
+struct SliceIt end
+
+# the catch-all recipes
+@recipe function f(::Type{SliceIt}, x, y, z)
+
+    # handle data with formatting attached
+    if typeof(x) <: Formatted
+        xformatter := x.formatter
+        x = x.data
+    end
+    if typeof(y) <: Formatted
+        yformatter := y.formatter
+        y = y.data
+    end
+    if typeof(z) <: Formatted
+        zformatter := z.formatter
+        z = z.data
+    end
+
+    xs, _ = convertToAnyVector(x, plotattributes)
+    ys, _ = convertToAnyVector(y, plotattributes)
+    zs, _ = convertToAnyVector(z, plotattributes)
+
+    fr = pop!(plotattributes, :fillrange, nothing)
+    fillranges, _ = if typeof(fr) <: Number
+        ([fr],nothing)
+    else
+        convertToAnyVector(fr, plotattributes)
+    end
+    mf = length(fillranges)
+
+    rib = pop!(plotattributes, :ribbon, nothing)
+    ribbons, _ = if typeof(rib) <: Number
+        ([fr],nothing)
+    else
+        convertToAnyVector(rib, plotattributes)
+    end
+    mr = length(ribbons)
+
+    # @show zs
+
+    mx = length(xs)
+    my = length(ys)
+    mz = length(zs)
+    if mx > 0 && my > 0 && mz > 0
+        for i in 1:max(mx, my, mz)
+            # add a new series
+            di = copy(plotattributes)
+            xi, yi, zi = xs[mod1(i,mx)], ys[mod1(i,my)], zs[mod1(i,mz)]
+            di[:x], di[:y], di[:z] = compute_xyz(xi, yi, zi)
+
+            # handle fillrange
+            fr = fillranges[mod1(i,mf)]
+            di[:fillrange] = isa(fr, Function) ? map(fr, di[:x]) : fr
+
+            # handle ribbons
+            rib = ribbons[mod1(i,mr)]
+            di[:ribbon] = isa(rib, Function) ? map(rib, di[:x]) : rib
+
+            push!(series_list, RecipeData(di, ()))
+        end
+    end
+    nothing  # don't add a series for the main block
+end
+
+# this is the default "type recipe"... just pass the object through
+@recipe f(::Type{T}, v::T) where {T<:Any} = v
+
+# this should catch unhandled "series recipes" and error with a nice message
+@recipe f(::Type{V}, x, y, z) where {V<:Val} = error("The backend must not support the series type $V, and there isn't a series recipe defined.")
+
+_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(v) && return Float64[]
+    args = RecipesBase.apply_recipe(plotattributes, typeof(v[1]), v[1])[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::KW)
+    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}
+    if all3D(plotattributes)
+        n,m = size(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, 1:m, 1: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 = size(mat)
+        wrap_surfaces(plotattributes)
+        SliceIt, 1:m, 1: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<:Number
+    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 = size(mat)
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, 1:m, 1:n, Surface(clamp_greys!(mat))
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        fillcolor --> ColorGradient([:black, :white])
+        SliceIt, 1:m, 1:n, Surface(clamp!(convert(Matrix{Float64}, mat), 0., 1.))
+    end
+end
+
+# # images - colors
+
+@recipe function f(mat::AMat{T}) where T<:Colorant
+	n, m = size(mat)
+
+    if is_seriestype_supported(:image)
+        seriestype := :image
+        yflip --> true
+        SliceIt, 1:m, 1:n, Surface(mat)
+    else
+        seriestype := :heatmap
+        yflip --> true
+        cbar --> false
+        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        SliceIt, 1:m, 1: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 1:size(shapes,2)
+        @series coords(vec(shapes[:,j]))
+    end
+end
+
+
+
+# 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 = try
+        axis_limits(plt[1][:xaxis])
+    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
+
+    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)]
+    xs = _scaled_adapted_grid(f, xscale, yscale, xmin, xmax)
+    xs, f
+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 = Any[_scaled_adapted_grid(f, xscale, yscale, xmin, xmax) for f in fs]
+    xs, fs
+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))
+    xinv.(adapted_grid(yf∘f∘xinv, xf.((xmin, xmax))))
+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 StaticArrays
+# # --------------------------------------------------------------------
+#
+# # if we get an unhandled tuple, just splat it in
+@recipe f(tup::Tuple) = tup
+
+#
+# # (x,y) tuples
+@recipe f(xy::AVec{Tuple{R1,R2}}) where {R1<:Number,R2<:Number} = unzip(xy)
+@recipe f(xy::Tuple{R1,R2}) where {R1<:Number,R2<:Number}       = [xy[1]], [xy[2]]
+
+#
+# # (x,y,z) tuples
+@recipe f(xyz::AVec{Tuple{R1,R2,R3}}) where {R1<:Number,R2<:Number,R3<:Number} = unzip(xyz)
+@recipe f(xyz::Tuple{R1,R2,R3}) where {R1<:Number,R2<:Number,R3<:Number}       = [xyz[1]], [xyz[2]], [xyz[3]]
+
+# these might be points+velocity, or OHLC or something else
+@recipe f(xyuv::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = get(plotattributes,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
+@recipe f(xyuv::Tuple{R1,R2,R3,R4}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number}       = [xyuv[1]], [xyuv[2]], [xyuv[3]], [xyuv[4]]
+
+
+#
+# # 2D StaticArrays
+@recipe f(xy::AVec{StaticArrays.SVector{2,T}}) where {T<:Number} = unzip(xy)
+@recipe f(xy::StaticArrays.SVector{2,T}) where {T<:Number}       = [xy[1]], [xy[2]]
+
+#
+# # 3D StaticArrays
+@recipe f(xyz::AVec{StaticArrays.SVector{3,T}}) where {T<:Number} = unzip(xyz)
+@recipe f(xyz::StaticArrays.SVector{3,T}) where {T<:Number}       = [xyz[1]], [xyz[2]], [xyz[3]]
+
+#
+# # --------------------------------------------------------------------
+# # 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 != :group) && size(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 1:length(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] = 1:length(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, 1:length(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
@@ -2,10 +2,10 @@
    scatter(x,y)
    scatter!(x,y)

-Make a scatter plot of y vs x.
+Make a scatter plot of y vs x. 

 # Examples
-```julia-repl
+```julia-repl 
 julia> scatter([1,2,3],[4,5,6],markersize=[3,4,5],markercolor=[:red,:green,:blue])
 julia> scatter([(1,4),(2,5),(3,6)])
 ```
@@ -16,9 +16,9 @@ julia> scatter([(1,4),(2,5),(3,6)])
    bar(x,y)
    bar!(x,y)

-Make a bar plot of y vs x.
+Make a bar plot of y vs x. 

-# Arguments
+# Arguments 

 - $(_document_argument("bar_position"))
 - $(_document_argument("bar_width"))
@@ -26,7 +26,7 @@ Make a bar plot of y vs x.
 - $(_document_argument("orientation"))

 # Examples
-```julia-repl
+```julia-repl 
 julia> bar([1,2,3],[4,5,6],fillcolor=[:red,:green,:blue],fillalpha=[0.2,0.4,0.6])
 julia> bar([(1,4),(2,5),(3,6)])
 ```
@@ -41,7 +41,7 @@ julia> bar([(1,4),(2,5),(3,6)])

 Plot a histogram.

-# Arguments
+# Arguments 

 - `x`: AbstractVector of values to be binned
 - $(_document_argument("bins"))
@@ -53,7 +53,7 @@ Plot a histogram.
 - $(_document_argument("orientation"))

 # Example
-```julia-repl
+```julia-repl 
 julia> histogram([1,2,1,1,4,3,8],bins=0:8)
 ```
 """
@@ -63,7 +63,7 @@ julia> histogram([1,2,1,1,4,3,8],bins=0:8)
    barhist(x)
    barhist!(x)

-Make a histogram bar plot. See `histogram`.
+Make a histogram bar plot. See `histogram`. 
 """
@shorthands barhist

@@ -72,7 +72,7 @@ Make a histogram bar plot. See `histogram`.
    stephist(x)

 Make a histogram step plot (bin counts are represented using horizontal lines
-instead of bars). See `histogram`.
+instead of bars). See `histogram`. 
 """
@shorthands stephist

@@ -80,8 +80,8 @@ instead of bars). See `histogram`.
    scatterhist(x)
    scatterhist!(x)

-Make a histogram scatter plot (bin counts are represented using points
-instead of bars). See `histogram`.
+Make a histogram scatter plot (bin counts are represented using points 
+instead of bars). See `histogram`. 
 """
@shorthands scatterhist

@@ -91,14 +91,14 @@ instead of bars). See `histogram`.

 Plot a two-dimensional histogram.

-# Arguments
+# Arguments 

- `bins`: Number of bins (if an `Integer`) or bin edges (if an `AbtractVector`)
- `weights`: Vector of weights for the values in `x`. Each entry of x contributes
-             its weight to the height of its bin.
+- `bins`: Number of bins (if an `Integer`) or bin edges (if an `AbtractVector`) 
+- `weights`: Vector of weights for the values in `x`. Each entry of x contributes 
+             its weight to the height of its bin. 

 # Example
-```julia-repl
+```julia-repl 
 julia> histogram2d(randn(10_000),randn(10_000))
 ```
 """
@@ -108,14 +108,14 @@ julia> histogram2d(randn(10_000),randn(10_000))
    density(x)
    density!(x)

-Make a line plot of a kernel density estimate of x.
+Make a line plot of a kernel density estimate of x. 

 # Arguments

- `x`: AbstractVector of samples for probability density estimation
+- `x`: AbstractVector of samples for probability density estimation 

 # Example
-```julia-repl
+```julia-repl 
 julia> using StatsPlots
 julia> density(randn(100_000))
 ```
@@ -126,10 +126,10 @@ julia> density(randn(100_000))
    heatmap(x,y,z)
    heatmap!(x,y,z)

-Plot a heatmap of the rectangular array `z`.
+Plot a heatmap of the rectangular array `z`. 

 # Example
-```julia-repl
+```julia-repl 
 julia> heatmap(randn(10,10))
 ```
 """
@@ -140,7 +140,7 @@ julia> heatmap(randn(10,10))
    hexbin(x,y)
    hexbin!(x,y)

-Make a hexagonal binning plot (a histogram of the observations `(x[i],y[i])`
+Make a hexagonal binning plot (a histogram of the observations `(x[i],y[i])` 
 with hexagonal bins)

 # Example
@@ -154,11 +154,11 @@ julia> hexbin(randn(10_000), randn(10_000))
    sticks(x,y)
    sticks!(x,y)

-Draw a stick plot of y vs x.
+Draw a stick plot of y vs x. 

 # Example
 ```julia-repl
-julia> sticks(1:10)
+julia> sticks(1:10) 
 ```
 """
@shorthands sticks
@@ -167,11 +167,11 @@ julia> sticks(1:10)
    hline(y)
    hline!(y)

-Draw horizontal lines at positions specified by the values in
+Draw horizontal lines at positions specified by the values in 
 the AbstractVector `y`

 # Example
-```julia-repl
+```julia-repl 
 julia> hline([-1,0,2])
 ```
 """
@@ -181,11 +181,11 @@ julia> hline([-1,0,2])
    vline(x)
    vline!(x)

-Draw vertical lines at positions specified by the values in
+Draw vertical lines at positions specified by the values in 
 the AbstractVector `x`

 # Example
-```julia-repl
+```julia-repl 
 julia> vline([-1,0,2])
 ```
 """
@@ -194,13 +194,13 @@ julia> vline([-1,0,2])
 """
    hspan(y)

-Draw a rectangle between the horizontal line at position `y[1]`
-and the horizontal line at position `y[2]`. If `length(y) ≥ 4`,
-then further rectangles are drawn between `y[3]` and `y[4]`,
-`y[5]` and `y[6]`, and so on. If `length(y)` is odd, then the
-last entry of `y` is ignored.
+Draw a rectangle between the horizontal line at position `y[1]` 
+and the horizontal line at position `y[2]`. If `length(y) ≥ 4`, 
+then further rectangles are drawn between `y[3]` and `y[4]`, 
+`y[5]` and `y[6]`, and so on. If `length(y)` is odd, then the 
+last entry of `y` is ignored. 
 # Example
-```julia-repl
+```julia-repl 
 julia> hspan(1:6)
 ```
 """
@@ -209,13 +209,13 @@ julia> hspan(1:6)
 """
    vspan(x)

-Draw a rectangle between the vertical line at position `x[1]`
-and the vertical line at position `x[2]`. If `length(x) ≥ 4`,
-then further rectangles are drawn between `x[3]` and `x[4]`,
-`x[5]` and `x[6]`, and so on. If `length(x)` is odd, then the
-last entry of `x` is ignored.
+Draw a rectangle between the vertical line at position `x[1]` 
+and the vertical line at position `x[2]`. If `length(x) ≥ 4`, 
+then further rectangles are drawn between `x[3]` and `x[4]`, 
+`x[5]` and `x[6]`, and so on. If `length(x)` is odd, then the 
+last entry of `x` is ignored. 
 # Example
-```julia-repl
+```julia-repl 
 julia> vspan(1:6)
 ```
 """
@@ -225,9 +225,9 @@ julia> vspan(1:6)
    ohlc(x,y::Vector{OHLC})
    ohlc!(x,y::Vector{OHLC})

-Make open-high-low-close plot. Each entry of y is represented by a vertical
-segment extending from the low value to the high value, with short horizontal
-segments on the left and right indicating the open and close values, respectively.
+Make open-high-low-close plot. Each entry of y is represented by a vertical 
+segment extending from the low value to the high value, with short horizontal 
+segments on the left and right indicating the open and close values, respectively. 

 # Example
 ```julia-repl
@@ -240,16 +240,16 @@ julia> ohlc(y)


 """
-    contour(x,y,z)
-    contour!(x,y,z)
+    contour(x,y,z) 
+    contour!(x,y,z) 

-Draw contour lines of the `Surface` z.
+Draw contour lines of the `Surface` z. 

 # Arguments
 - `levels`: Contour levels (if `AbstractVector`) or number of levels (if `Integer`)
 - `fill`: Bool. Fill area between contours or draw contours only (false by default)

-# Example
+# Example 
 ```julia-repl
 julia> x = y = range(-20, 20, length = 100)
 julia> contour(x, y, (x, y) -> x^2 + y^2)
@@ -267,11 +267,10 @@ julia> contour(x, y, (x, y) -> x^2 + y^2)
    surface(x,y,z)
    surface!(x,y,z)

-Draw a 3D surface plot.
+Draw a 3D surface plot. 

 # Example
-```julia-repl
-julia> using LinearAlgebra
+```julia-repl 
 julia> x = y = range(-3, 3, length = 100)
 julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
 ```
@@ -282,10 +281,10 @@ julia> surface(x, y, (x, y) -> sinc(norm([x, y])))
    wireframe(x,y,z)
    wireframe!(x,y,z)

-Draw a 3D wireframe plot.
+Draw a 3D wireframe plot. 

 # Example
-```julia-repl
+```julia-repl 
 julia> wireframe(1:10,1:10,randn(10,10))
 ```
 """
@@ -296,10 +295,10 @@ julia> wireframe(1:10,1:10,randn(10,10))
    path3d!(x,y,z)

 Plot a 3D path from `(x[1],y[1],z[1])` to `(x[2],y[2],z[2])`,
-..., to `(x[end],y[end],z[end])`.
+..., to `(x[end],y[end],z[end])`. 

 # Example
-```julia-repl
+```julia-repl 
 julia> path3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
 ```
 """
@@ -309,10 +308,10 @@ julia> path3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
    scatter3d(x,y,z)
    scatter3d!(x,y,z)

-Make a 3D scatter plot.
+Make a 3D scatter plot. 

 # Example
-```julia-repl
+```julia-repl 
 julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
 ```
 """
@@ -322,17 +321,17 @@ julia> scatter3d([0,1,2,3],[0,1,4,9],[0,1,8,27])
    boxplot(x, y)
    boxplot!(x, y)

-Make a box and whisker plot.
+Make a box and whisker plot. 

 # Keyword arguments
 - `notch`: Bool. Notch the box plot? (false)
 - `range`: Real. Values more than range*IQR below the first quartile
-           or above the third quartile are shown as outliers (1.5)
- `outliers`: Bool. Show outliers? (true)
- `whisker_width`: Real or Symbol. Length of whiskers (:match)
+           or above the third quartile are shown as outliers (1.5) 
+- `outliers`: Bool. Show outliers? (true) 
+- `whisker_width`: Real or Symbol. Length of whiskers (:match) 

 # Example
-```julia-repl
+```julia-repl 
 julia> using StatsPlots
 julia> boxplot(repeat([1,2,3],outer=100),randn(300))
 ```
@@ -343,10 +342,10 @@ julia> boxplot(repeat([1,2,3],outer=100),randn(300))
    violin(x,y,z)
    violin!(x,y,z)

-Make a violin plot.
+Make a violin plot. 

 # Example
-```julia-repl
+```julia-repl 
 julia> violin(repeat([1,2,3],outer=100),randn(300))
 ```
 """
@@ -356,11 +355,11 @@ julia> violin(repeat([1,2,3],outer=100),randn(300))
    quiver(x,y,quiver=(u,v))
    quiver!(x,y,quiver=(u,v))

-Make a quiver (vector field) plot. The `i`th vector extends
-from `(x[i],y[i])` to `(x[i] + u[i], y[i] + v[i])`.
+Make a quiver (vector field) plot. The `i`th vector extends 
+from `(x[i],y[i])` to `(x[i] + u[i], y[i] + v[i])`. 

 # Example
-```julia-repl
+```julia-repl 
 julia> quiver([1,2,3],[3,2,1],quiver=([1,1,1],[1,2,3]))
 ```
 """
@@ -370,11 +369,11 @@ julia> quiver([1,2,3],[3,2,1],quiver=([1,1,1],[1,2,3]))
    curves(x,y)
    curves!(x,y)

-Draw a Bezier curve from `(x[1],y[1])` to `(x[end],y[end])`
+Draw a Bezier curve from `(x[1],y[1])` to `(x[end],y[end])` 
 with control points `(x[2],y[2]), ..., (x[end-1],y[end]-1)`

 # Example
-```julia-repl
+```julia-repl 
 julia> curves([1,2,3,4],[1,1,2,4])
 ```
 """
@@ -425,12 +424,12 @@ ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     =
 """
    annotate!(anns...)

-Add annotations to an existing plot.
+Add annotations to an existing plot. 

-# Arguments
+# 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...)
@@ -451,7 +449,7 @@ yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip
 "Specify x axis attributes for an existing plot"
 xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)

-"Specify y axis attributes for an existing plot"
+"Specify x axis attributes for an existing plot"
 yaxis!(args...; kw...)                                    = plot!(; yaxis = args, kw...)
 xgrid!(args...; kw...)                                    = plot!(; xgrid = args, kw...)
 ygrid!(args...; kw...)                                    = plot!(; ygrid = args, kw...)
@@ -7,7 +7,7 @@ function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
        (20mm, 5mm, 2mm, 10mm),
        defaultbox,
        defaultbox,
-        DefaultsDict(KW(), _subplot_defaults),
+        KW(),
        nothing,
        nothing
    )
@@ -4,19 +4,39 @@
 Specify the colour theme for plots.
 """
 function theme(s::Symbol; kw...)
-    defaults = copy(PlotThemes._themes[s].defaults)
+    defaults = _get_defaults(s)
    _theme(s, defaults; kw...)
 end

-function _theme(s::Symbol, defaults::AKW; kw...)
+function _get_defaults(s::Symbol)
+    thm = PlotThemes._themes[s]
+    if :defaults in fieldnames(typeof(thm))
+        return thm.defaults
+    else # old PlotTheme type
+        defaults = KW(
+            :bg       => thm.bg_secondary,
+            :bginside => thm.bg_primary,
+            :fg       => thm.lines,
+            :fgtext   => thm.text,
+            :fgguide  => thm.text,
+            :fglegend => thm.text,
+            :palette  => thm.palette,
+        )
+        if thm.gradient != nothing
+            push!(defaults, :gradient => thm.gradient)
+        end
+        return defaults
+    end
+end
+
+function _theme(s::Symbol, defaults::KW; kw...)
    # Reset to defaults to overwrite active theme
    reset_defaults()

    # Set the theme's gradient as default
-    if haskey(defaults, :colorgradient)
+    if haskey(defaults, :gradient)
        PlotUtils.clibrary(:misc)
        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
-        pop!(defaults, :colorgradient)
    else
        PlotUtils.clibrary(:Plots)
        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
@@ -24,8 +44,8 @@ function _theme(s::Symbol, defaults::AKW; kw...)

    # maybe overwrite the theme's gradient
    kw = KW(kw)
-    if haskey(kw, :colorgradient)
-        kwgrad = pop!(kw, :colorgradient)
+    if haskey(kw, :gradient)
+        kwgrad = pop!(kw, :gradient)
        for clib in clibraries()
            if kwgrad in cgradients(clib)
                PlotUtils.clibrary(clib)
@@ -54,11 +74,11 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func

@recipe function showtheme(st::ShowTheme)
    thm, cfunc = _get_showtheme_args(st.args...)
-    defaults = PlotThemes._themes[thm].defaults
+    defaults = _get_defaults(thm)

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

    # get the palette
    palette = get(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
@@ -66,7 +86,7 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func

    # apply the theme
    for k in keys(defaults)
-        k in (:colorgradient, :palette) && continue
+        k in (:gradient, :palette) && continue
        def = defaults[k]
        arg = get(_keyAliases, k, k)
        plotattributes[arg] = if typeof(def) <: Colorant
@@ -119,30 +139,27 @@ _get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func
    @series begin
        subplot := 4
        seriestype := :heatmap
-        seriescolor := colorgradient
-        xticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        yticks := (-2π:2π:2π, string.(-2:2:2, "π"))
+        seriescolor := gradient
+        ticks := -5:5:5
        x, y, z
    end

    @series begin
        subplot := 5
        seriestype := :surface
-        seriescolor := colorgradient
-        xticks := (-2π:2π:2π, string.(-2:2:2, "π"))
-        yticks := (-2π:2π:2π, string.(-2:2:2, "π"))
+        seriescolor := gradient
        x, y, z
    end

    n = 100
    ts = range(0, stop = 10π, length = n)
-    x = (0.1ts) .* cos.(ts)
+    x = ts .* cos.(ts)
    y = (0.1ts) .* sin.(ts)
    z = 1:n

    @series begin
        subplot := 6
-        seriescolor := colorgradient
+        seriescolor := gradient
        linewidth := 3
        line_z := z
        x, y, z
@@ -5,7 +5,6 @@
 const AVec = AbstractVector
 const AMat = AbstractMatrix
 const KW = Dict{Symbol,Any}
-const AKW = AbstractDict{Symbol,Any}
 const TicksArgs = Union{AVec{T}, Tuple{AVec{T}, AVec{S}}, Symbol} where {T<:Real, S<:AbstractString}

 struct PlotsDisplay <: AbstractDisplay end
@@ -18,10 +17,11 @@ end
 wrap(obj::T) where {T} = InputWrapper{T}(obj)
 Base.isempty(wrapper::InputWrapper) = false

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

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

 attr(series::Series, k::Symbol) = series.plotattributes[k]
@@ -36,7 +36,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::KW  # 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 +48,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::KW
 end

 mutable struct Extrema
@@ -67,7 +67,8 @@ 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::KW                     # arguments for the whole plot
+    user_attr::KW                # raw arg inputs (after aliases).  these are used as the input dict in `_plot!`
    series_list::Vector{Series}  # arguments for each series
    o                            # the backend's plot object
    subplots::Vector{Subplot}
@@ -78,7 +79,7 @@ mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
 end

 function Plot()
-    Plot(backend(), 0, DefaultsDict(KW(), _plot_defaults), Series[], nothing,
+    Plot(backend(), 0, KW(), KW(), Series[], nothing,
         Subplot[], SubplotMap(), EmptyLayout(),
         Subplot[], false)
 end
@@ -1 +0,0 @@
-reference_images
@@ -0,0 +1,10 @@
+StatsPlots
+Images
+ImageMagick
+@osx QuartzImageIO
+FileIO
+GR 0.31.0
+RDatasets
+VisualRegressionTests
+UnicodePlots
+LaTeXStrings
@@ -0,0 +1,50 @@
+using Pkg
+
+# need this to use Conda
+# ENV["PYTHON"] = ""
+
+to_add = [
+    # PackageSpec(url="https://github.com/JuliaStats/KernelDensity.jl.git"),
+    PackageSpec(name="PlotUtils", rev="master"),
+    PackageSpec(name="RecipesBase", rev="master"),
+    # PackageSpec(name="Blink", rev="master"),
+    # PackageSpec(name="Rsvg", rev="master"),
+    # PackageSpec(name="PlotlyJS", rev="master"),
+    # PackageSpec(name="VisualRegressionTests", rev="master"),
+    # PackageSpec("PyPlot"),
+    # PackageSpec("InspectDR"),
+]
+
+if isinteractive()
+    Pkg.develop(PackageSpec(url="https://github.com/JuliaPlots/PlotReferenceImages.jl.git"))
+    append!(to_add, [
+        PackageSpec(name="FileIO"),
+        PackageSpec(name="ImageMagick"),
+        PackageSpec(name="UnicodePlots"),
+        PackageSpec(name="VisualRegressionTests"),
+        PackageSpec(name="Gtk"),
+        # PlotlyJS:
+        # PackageSpec(name="PlotlyJS"),
+        # PackageSpec(name="Blink"),
+        # PackageSpec(name="ORCA"),
+        # PyPlot:
+        # PackageSpec(name="PyPlot"),
+        # PackageSpec(name="PyCall"),
+        # PackageSpec(name="LaTeXStrings"),
+    ])
+else
+    push!(to_add, PackageSpec(
+        name="PlotReferenceImages",
+        url="https://github.com/JuliaPlots/PlotReferenceImages.jl.git",
+        rev = "sd-tomls"
+    ))
+end
+
+Pkg.add(to_add)
+
+Pkg.build("ImageMagick")
+# Pkg.build("GR")
+# Pkg.build("Blink")
+# import Blink
+# Blink.AtomShell.install()
+# Pkg.build("PyPlot")
@@ -1,28 +1,92 @@
+
+using VisualRegressionTests
+# using ExamplePlots
+
+if isinteractive()
+    @eval Main import Gtk
+end
+
+# import DataFrames, RDatasets
+
+# don't let pyplot use a gui... it'll crash
+# note: Agg will set gui -> :none in PyPlot
+# ENV["MPLBACKEND"] = "Agg"
+# try
+#   @eval import PyPlot
+#   @info("Matplotlib version: $(PyPlot.matplotlib[:__version__])")
+# end
+
+
+using Plots
+# using StatsPlots
+import PlotReferenceImages
+using Random
+using Test
+
+default(size=(500,300))
+
+
+# TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that
+#       is referenced in a button press callback (the button clicked callback will call notify() on that condition)
+
 import Plots._current_plots_version

-function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !is_ci(), sigma = [1,1], tol = 1e-2)
+
+function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2)
    Plots._debugMode.on = debug
    example = Plots._examples[idx]
-    Plots.theme(:default)
    @info("Testing plot: $pkg:$idx:$(example.header)")
    backend(pkg)
    backend()
-    default(size=(500,300))
+
    # ensure consistent results
    Random.seed!(1234)

+    # reference image directory setup
+    # refdir = joinpath(Pkg.dir("ExamplePlots"), "test", "refimg", string(pkg))
+    refdir = joinpath(dirname(pathof(PlotReferenceImages)), "..", "Plots", string(pkg))
    fn = "ref$idx.png"
-    reffn = reference_file(pkg, idx, _current_plots_version)
-    newfn = joinpath(reference_path(pkg, _current_plots_version), fn)
+
+    # firgure out version info
+    vns = filter(x->x[1] != '.', readdir(refdir))
+    versions = sort(VersionNumber.(vns), rev = true)
+    versions = filter(v -> v <= _current_plots_version, versions)
+    # @show refdir fn versions
+
+    newdir = joinpath(refdir, string(_current_plots_version))
+    newfn = joinpath(newdir, fn)
+
+    # figure out which reference file we should compare to, by finding the highest versioned file
+    reffn = nothing
+    for v in versions
+        tmpfn = joinpath(refdir, string(v), fn)
+        if isfile(tmpfn)
+            reffn = tmpfn
+            break
+        end
+    end
+
+    # now we have the fn (if any)... do the comparison
+    # @show reffn
+    if reffn == nothing
+        reffn = newfn
+    end
+    # @show reffn
+    # return

    # test function
    func = (fn, idx) -> begin
-        expr = Expr(:block)
-        append!(expr.args, example.exprs)
-        eval(expr)
+        map(eval, example.exprs)
        png(fn)
    end

+    # try
+    #     run(`mkdir -p $newdir`)
+    # catch err
+    #     display(err)
+    # end
+    # # reffn = joinpath(refdir, "ref$idx.png")
+
    # the test
    vtest = VisualTest(func, reffn, idx)
    test_images(vtest, popup=popup, sigma=sigma, tol=tol, newfn = newfn)
@@ -36,7 +100,7 @@ function image_comparison_facts(pkg::Symbol;
                                tol = 1e-2)     # acceptable error (percent)
  for i in 1:length(Plots._examples)
    i in skip && continue
-    if only === nothing || i in only
+    if only == nothing || i in only
      @test image_comparison_tests(pkg, i, debug=debug, sigma=sigma, tol=tol) |> success == true
    end
  end
@@ -1,119 +1,103 @@
-import ImageMagick
-using VisualRegressionTests
-using Plots
-using Random
-using Test
-using FileIO
-using Gtk
-using LibGit2
-using GeometryTypes
-using Dates
-
-include("test_hdf5plots.jl")
-include("test_pgfplotsx.jl")
-
-reference_dir(args...) = joinpath(homedir(), ".julia", "dev", "PlotReferenceImages", args...)
-
-function reference_file(backend, i, version)
-    refdir = reference_dir("Plots", string(backend))
-    fn = "ref$i.png"
-    versions = sort(VersionNumber.(readdir(refdir)), rev = true)
-
-    reffn = joinpath(refdir, string(version), fn)
-    for v in versions
-        tmpfn = joinpath(refdir, string(v), fn)
-        if isfile(tmpfn)
-            reffn = tmpfn
-            break
-        end
-    end
-
-    return reffn
-end
-
-reference_path(backend, version) = reference_dir("Plots", string(backend), string(version))
-
-if !isdir(reference_dir())
-    mkpath(reference_dir())
-    LibGit2.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git", reference_dir())
-end
+module PlotsTests

+include("add_packages.jl")
 include("imgcomp.jl")
+
 # don't actually show the plots
 Random.seed!(1234)
 default(show=false, reuse=true)
-is_ci() = get(ENV, "CI", "false") == "true"
-img_tol = is_ci() ? 1e-2 : Sys.islinux() ? 1e-3 : 0.1
+img_tol = isinteractive() ? 1e-2 : 10e-2

-## 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
+    ENV["PLOTS_TEST"] = "true"
+    ENV["GKSwstype"] = "100"
+    @test gr() == Plots.GRBackend()
+    @test backend() == Plots.GRBackend()

-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 "Backends" begin
-
-    @testset "GR" begin
-        ENV["PLOTS_TEST"] = "true"
-        ENV["GKSwstype"] = "100"
-        @test gr() == Plots.GRBackend()
-        @test backend() == Plots.GRBackend()
-
-        @static if haskey(ENV, "APPVEYOR")
-            @info "Skipping GR image comparison tests on AppVeyor"
-        else
-            image_comparison_facts(:gr, tol=img_tol, skip = Plots._backend_skips[:gr])
-        end
+    @static if Sys.islinux()
+        image_comparison_facts(:gr, tol=img_tol, skip = [25, 30])
    end
-
-    @testset "UnicodePlots" begin
-        @test unicodeplots() == Plots.UnicodePlotsBackend()
-        @test backend() == Plots.UnicodePlotsBackend()
-
-        # lets just make sure it runs without error
-        p = plot(rand(10))
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = bar(randn(10))
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([1, 2], [3, 4])
-        annotate!(p, [(1.5, 3.2, Plots.text("Test", :red, :center))])
-        hline!(p, [3.1])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        hline!(p, [3.1])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, Plots.text("Test", :red, :center))])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-        p = plot([Dates.Date(2019, 1, 1), Dates.Date(2019, 2, 1)], [3, 4])
-        annotate!(p, [(Dates.Date(2019, 1, 15), 3.2, Plots.text("Test", :red, :center))])
-        hline!(p, [3.1])
-        @test isa(p, Plots.Plot) == true
-        @test isa(display(p), Nothing) == true
-    end
-
 end

+# @static if isinteractive()
+#     @testset "PyPlot" begin
+#         @test pyplot() == Plots.PyPlotBackend()
+#         @test backend() == Plots.PyPlotBackend()
+#
+#         image_comparison_facts(:pyplot, tol=img_tol, skip = [2, 25, 30, 31])
+#     end
+# end
+
+@testset "UnicodePlots" begin
+    @test unicodeplots() == Plots.UnicodePlotsBackend()
+    @test backend() == Plots.UnicodePlotsBackend()
+
+    # lets just make sure it runs without error
+    @test isa(plot(rand(10)), Plots.Plot) == true
+end
+
+# The plotlyjs testimages return a connection error on travis:
+# connect: connection refused (ECONNREFUSED)
+
+# @static if isinteractive()
+#     @testset "PlotlyJS" begin
+#         @test plotlyjs() == Plots.PlotlyJSBackend()
+#         @test backend() == Plots.PlotlyJSBackend()
+#
+#         image_comparison_facts(:plotlyjs,
+#             skip=[
+#                 2,  # animation (skipped for speed)
+#                 25,
+#                 27, # (polar plots) takes very long / not working
+#                 30,
+#                 31, # animation (skipped for speed)
+#             ],
+#             tol=img_tol)
+#     end
+# end
+
+# InspectDR returns that error on travis:
+# ERROR: LoadError: InitError: Cannot open display:
+#  in Gtk.GLib.GError(::Gtk.##229#230) at /home/travis/.julia/v0.5/Gtk/src/GLib/gerror.jl:17
+
+# @testset "InspectDR" begin
+#     @test inspectdr() == Plots.InspectDRBackend()
+#     @test backend() == Plots.InspectDRBackend()
+#
+#     image_comparison_facts(:inspectdr,
+#         skip=[
+#             2,  # animation
+#             6,  # heatmap not defined
+#             10, # heatmap not defined
+#             22, # contour not defined
+#             23, # pie not defined
+#             27, # polar plot not working
+#             28, # heatmap not defined
+#             31, # animation
+#         ],
+#         tol=img_tol)
+# end
+
+
+# @testset "Plotly" begin
+#     @test plotly() == Plots.PlotlyBackend()
+#     @test backend() == Plots.PlotlyBackend()
+#
+#     # # until png generation is reliable on OSX, just test on linux
+#     # @static Sys.islinux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], tol=img_tol)
+# end
+
+# @testset "PlotlyJS" begin
+#     @test plotlyjs() == Plots.PlotlyJSBackend()
+#     @test backend() == Plots.PlotlyJSBackend()
+#
+#     # as long as we can plot anything without error, it should be the same as Plotly
+#     image_comparison_facts(:plotlyjs, only=[1], tol=img_tol)
+# end
+
+
+
+
@testset "Axes" begin
    p = plot()
    axis = p.subplots[1][:xaxis]
@@ -129,52 +113,46 @@ end
 end

@testset "NoFail" begin
-    plots = [histogram([1, 0, 0, 0, 0, 0]),
-             plot([missing]),
-             plot([missing; 1:4]),
-             plot([fill(missing,10); 1:4]),
-             plot([1 1; 1 missing]),
-             plot(["a" "b"; missing "d"], [1 2; 3 4])]
-    for plt in plots
-        display(plt)
-    end
-    @test_nowarn plot(x->x^2,0,2)
+    histogram([1, 0, 0, 0, 0, 0])
 end

-@testset "EmptyAnim" begin
-    anim = @animate for i in []
-    end
+# tests for preprocessing recipes

-    @test_throws ArgumentError gif(anim)
-end
+# @testset "recipes" begin

-@testset "Segments" begin
-    function segments(args...)
-        segs = UnitRange{Int}[]
-        for seg in iter_segments(args...)
-            push!(segs,seg)
-        end
-        segs
-    end
+    # user recipe

-    nan10 = fill(NaN,10)
-    @test segments(11:20) == [1:10]
-    @test segments([NaN]) == []
-    @test segments(nan10) == []
-    @test segments([nan10; 1:5]) == [11:15]
-    @test segments([1:5;nan10]) == [1:5]
-    @test segments([nan10; 1:5; nan10; 1:5; nan10]) == [11:15, 26:30]
-    @test segments([NaN; 1], 1:10) == [2:2, 4:4, 6:6, 8:8, 10:10]
-    @test segments([nan10; 1:15], [1:15; nan10]) == [11:15]
-end
+    # type T end
+    # @recipe function f(::T)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     bg := :yellow
+    #     rand(10)
+    # end
+    # plot(T())

-@testset "Utils" begin
-    zipped = ([(1,2)], [("a","b")], [(1,"a"),(2,"b")],
-              [(1,2),(3,4)], [(1,2,3),(3,4,5)], [(1,2,3,4),(3,4,5,6)],
-              [(1,2.0),(missing,missing)], [(1,missing),(missing,"a")],
-              [(missing,missing)], [(missing,missing,missing),("a","b","c")])
-    for z in zipped
-        @test isequal(collect(zip(Plots.unzip(z)...)), z)
-        @test isequal(collect(zip(Plots.unzip(GeometryTypes.Point.(z))...)), z)
-    end
-end
+    # plot recipe
+
+    # @recipe function f(::Type{Val{:hiplt}},plt::Plot)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     t := :path
+    #     bg:=:green
+    #     ()
+    # end
+    # plot(rand(10),t=:hiplt)
+
+    # series recipe
+
+    # @recipe function f(::Type{Val{:hi}},x,y,z)
+    #     line := (3,0.3,:red)
+    #     marker := (20,0.5,:blue,:o)
+    #     t := :path
+    #     ()
+    # end
+    # plot(rand(10),t=:hiplt)
+
+# end
+
+
+end # module
@@ -0,0 +1,36 @@
+import SnoopCompile
+
+### Log the compiles
+# This only needs to be run once (to generate "/tmp/plots_compiles.csv")
+
+# SnoopCompile.@snoop "/tmp/plots_compiles.csv" begin
+#     include(joinpath(dirname(@__FILE__), "runtests.jl"))
+# end
+
+# ----------------------------------------------------------
+
+### Parse the compiles and generate precompilation scripts
+# This can be run repeatedly to tweak the scripts
+
+# IMPORTANT: we must have the module(s) defined for the parcelation
+# step, otherwise we will get no precompiles for the Plots module
+using Plots
+
+data = SnoopCompile.read("/tmp/plots_compiles.csv")
+
+# The Plots tests are run inside a module PlotsTest, so all
+# the precompiles get credited to PlotsTest. Credit them to Plots instead.
+subst = Dict("PlotsTests"=>"Plots")
+
+# Blacklist helps fix problems:
+# - MIME uses type-parameters with symbols like :image/png, which is
+#   not parseable
+blacklist = ["MIME"]
+
+# Use these two lines if you want to create precompile functions for
+# individual packages
+pc, discards = SnoopCompile.parcel(data[end:-1:1,2], subst=subst, blacklist=blacklist)
+SnoopCompile.write("/tmp/precompile", pc)
+
+pdir = joinpath(dirname(@__FILE__), "..")
+run(`cp /tmp/precompile/precompile_Plots.jl $pdir/src/precompile.jl`)
@@ -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
@@ -1,328 +0,0 @@
-using Plots, Test
-pgfplotsx()
-
-function create_plot(args...; kwargs...)
-   pgfx_plot = plot(args...; kwargs...)
-   return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-function create_plot!(args...; kwargs...)
-   pgfx_plot = plot!(args...; kwargs...)
-   return pgfx_plot, repr("application/x-tex", pgfx_plot)
-end
-
-@testset "PGFPlotsX" begin
-   pgfx_plot = plot(1:5)
-   Plots._update_plot_object(pgfx_plot)
-   @test pgfx_plot.o.the_plot isa PGFPlotsX.TikzDocument
-   @test pgfx_plot.series_list[1].plotattributes[:quiver] === nothing
-   axis = Plots.pgfx_axes(pgfx_plot.o)[1]
-   @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)
-      x = ts .* map(cos, ts)
-      y = (0.1ts) .* map(sin, ts)
-      z = 1:n
-      pl = plot(
-         x,
-         y,
-         z,
-         zcolor = reverse(z),
-         m = (10, 0.8, :blues, Plots.stroke(0)),
-         leg = false,
-         cbar = true,
-         w = 5,
-      )
-      pgfx_plot = plot!(pl, zeros(n), zeros(n), 1:n, w = 10)
-      Plots._update_plot_object(pgfx_plot)
-      if @test_nowarn(
-         haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true
-      )
-         @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-      end
-   end # testset
-   @testset "Color docs example" begin
-      y = rand(100)
-      plot(
-         0:10:100,
-         rand(11, 4),
-         lab = "lines",
-         w = 3,
-         palette = :grays,
-         fill = 0,
-         α = 0.6,
-      )
-      pl = scatter!(
-         y,
-         zcolor = abs.(y .- 0.5),
-         m = (:heat, 0.8, Plots.stroke(1, :green)),
-         ms = 10 * abs.(y .- 0.5) .+ 4,
-         lab = ["grad", "", "ient"],
-      )
-      Plots._update_plot_object(pl)
-      axis = Plots.pgfx_axes(pl.o)[1]
-      @test count(x -> x isa PGFPlotsX.LegendEntry, axis.contents) == 6
-      @test count(x -> x isa PGFPlotsX.Plot, axis.contents) == 108 # each marker is its own plot, fillranges create 2 plot-objects
-      marker = axis.contents[15]
-      @test marker isa PGFPlotsX.Plot
-      @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
-   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")
-   end # testset
-   @testset "Marker types" begin
-      markers = filter((m -> begin
-         m in Plots.supported_markers()
-      end), Plots._shape_keys)
-      markers = reshape(markers, 1, length(markers))
-      n = length(markers)
-      x = (range(0, stop = 10, length = n + 2))[2:(end - 1)]
-      y = repeat(reshape(reverse(x), 1, :), n, 1)
-      scatter(
-         x,
-         y,
-         m = (8, :auto),
-         lab = map(string, markers),
-         bg = :linen,
-         xlim = (0, 10),
-         ylim = (0, 10),
-      )
-   end # testset
-   @testset "Layout" begin
-      plot(
-         Plots.fakedata(100, 10),
-         layout = 4,
-         palette = [:grays :blues :heat :lightrainbow],
-         bg_inside = [:orange :pink :darkblue :black],
-      )
-   end # testset
-   @testset "Polar plots" begin
-      Θ = range(0, stop = 1.5π, length = 100)
-      r = abs.(0.1 * randn(100) + sin.(3Θ))
-      plot(Θ, r, proj = :polar, m = 2)
-   end # testset
-   @testset "Drawing shapes" begin
-      verts = [
-         (-1.0, 1.0),
-         (-1.28, 0.6),
-         (-0.2, -1.4),
-         (0.2, -1.4),
-         (1.28, 0.6),
-         (1.0, 1.0),
-         (-1.0, 1.0),
-         (-0.2, -0.6),
-         (0.0, -0.2),
-         (-0.4, 0.6),
-         (1.28, 0.6),
-         (0.2, -1.4),
-         (-0.2, -1.4),
-         (0.6, 0.2),
-         (-0.2, 0.2),
-         (0.0, -0.2),
-         (0.2, 0.2),
-         (-0.2, -0.6),
-      ]
-      x = 0.1:0.2:0.9
-      y = 0.7 * rand(5) .+ 0.15
-      plot(
-         x,
-         y,
-         line = (3, :dash, :lightblue),
-         marker = (Shape(verts), 30, RGBA(0, 0, 0, 0.2)),
-         bg = :pink,
-         fg = :darkblue,
-         xlim = (0, 1),
-         ylim = (0, 1),
-         leg = false,
-      )
-   end # testset
-   @testset "Histogram 2D" begin
-      histogram2d(randn(10000), randn(10000), nbins = 20)
-   end # testset
-   @testset "Heatmap-like" begin
-      xs = [string("x", i) for i = 1:10]
-      ys = [string("y", i) for i = 1:4]
-      z = float((1:4) * reshape(1:10, 1, :))
-      pgfx_plot = heatmap(xs, ys, z, aspect_ratio = 1)
-      Plots._update_plot_object(pgfx_plot)
-      if @test_nowarn(
-         haskey(Plots.pgfx_axes(pgfx_plot.o)[1].options.dict, "colorbar") == true
-      )
-         @test Plots.pgfx_axes(pgfx_plot.o)[1]["colorbar"] === nothing
-         @test Plots.pgfx_axes(pgfx_plot.o)[1]["colormap name"] == "plots1"
-      end
-
-      pgfx_plot = wireframe(xs, ys, z, aspect_ratio = 1)
-      # TODO: clims are wrong
-   end # testset
-   @testset "Contours" begin
-      x = 1:0.5:20
-      y = 1:0.5:10
-      f(x, y) = begin
-         (3x + y^2) * abs(sin(x) + cos(y))
-      end
-      X = repeat(reshape(x, 1, :), length(y), 1)
-      Y = repeat(y, 1, length(x))
-      Z = map(f, X, Y)
-      p2 = contour(x, y, Z)
-      p1 = contour(x, y, f, fill = true)
-      plot(p1, p2)
-      # TODO: colorbar for filled contours
-   end # testset
-   @testset "Varying colors" begin
-      t = range(0, stop = 1, length = 100)
-      θ = (6π) .* t
-      x = t .* cos.(θ)
-      y = t .* sin.(θ)
-      p1 = plot(x, y, line_z = t, linewidth = 3, legend = false)
-      p2 = scatter(
-         x,
-         y,
-         marker_z = ((x, y) -> begin
-            x + y
-         end),
-         color = :bluesreds,
-         legend = false,
-      )
-      plot(p1, p2)
-   end # testset
-   @testset "Framestyles" begin
-      scatter(
-         fill(randn(10), 6),
-         fill(randn(10), 6),
-         framestyle = [:box :semi :origin :zerolines :grid :none],
-         title = [":box" ":semi" ":origin" ":zerolines" ":grid" ":none"],
-         color = permutedims(1:6),
-         layout = 6,
-         label = "",
-         markerstrokewidth = 0,
-         ticks = -2:2,
-      )
-      # TODO: support :semi
-   end # testset
-   @testset "Quiver" begin
-      x = (-2pi):0.2:(2 * pi)
-      y = sin.(x)
-
-      u = ones(length(x))
-      v = cos.(x)
-      arrow_plot = plot(x, y, quiver = (u, v), arrow = true)
-      # TODO: could adjust limits to fit arrows if too long, but how?
-      # TODO: get latex available on CI
-      # mktempdir() do path
-      #    @test_nowarn savefig(arrow_plot, path*"arrow.pdf")
-      # end
-   end # testset
-   @testset "Annotations" begin
-      y = rand(10)
-      pgfx_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),
-         marker = (50, 0.2, :orange),
-         series_annotations = [
-            "series",
-            "annotations",
-            "map",
-            "to",
-            "series",
-            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
-   end # testset
-   @testset "Ribbon" begin
-      aa = rand(10)
-      bb = rand(10)
-      cc = rand(10)
-      conf = [aa - cc bb - cc]
-      ribbon_plot =
-         plot(collect(1:10), fill(1, 10), ribbon = (conf[:, 1], conf[:, 2]))
-      Plots._update_plot_object(ribbon_plot)
-      axis = Plots.pgfx_axes(ribbon_plot.o)[1]
-      plots = filter(x -> x isa PGFPlotsX.Plot, axis.contents)
-      @test length(plots) == 4
-      @test !haskey(plots[1].options.dict, "fill")
-      @test !haskey(plots[2].options.dict, "fill")
-      @test !haskey(plots[3].options.dict, "fill")
-      @test haskey(plots[4].options.dict, "fill")
-      @test ribbon_plot.o !== nothing
-      @test ribbon_plot.o.the_plot !== nothing
-      #    mktempdir() do path
-      #       @test_nowarn savefig(ribbon_plot, path*"ribbon.svg")
-      #    end
-   end # testset
-end # testset
Author	SHA1	Message	Date
SimonDanisch	5b6d7d10d4	use correct revision	2019-01-31 18:50:20 +01:00
SimonDanisch	71cf37cc16	use name	2019-01-31 18:27:54 +01:00