0.6 fixes

inline docs for plot
starting no-conditional reorg; replaced FixedSizeArrays with StaticArrays
2017-02-21 12:10:38 -05:00 · 2017-01-18 13:45:02 -05:00 · 2017-01-18 12:08:20 -05:00
46 changed files with 1582 additions and 4512 deletions
@@ -4,7 +4,7 @@ os:
  - linux
  # - osx
 julia:
-  - 0.6
+  - 0.5
 matrix:
  allow_failures:
    - julia: nightly
@@ -3,183 +3,14 @@

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

- All new development should target 0.14!
- Minor version 0.11 is the last one to support Julia 0.5!!
+- All new development should target 0.9!
+- Minor version 0.8 is the last one to support Julia 0.4!!
 	- Critical bugfixes only
-    - `backports` branch is for Julia 0.5
+    - `backports` branch is for Julia 0.4

 ---
-## (current master)
-
-## 0.14.1
-
- Add linestyle argument to the legend
- Plotly: bar_width and stroke_width support for bar plots
- abline! does not change axis limits
- Fix default log scale ticks in GR backend
- Use the :fontsize keys so the scalefontsizes command works
- Prepare support for new PlotTheme type in PlotThemes
-
-## 0.14.0
-
- remove use of imagemagick; saving gifs now requires ffmpeg
- improvements to ffmpeg gif quality and speed
- overhaul of fonts, allows setting fonts in recipes and with magic arguments
- added `camera` attribute to control camera position for 3d plots
- added `showaxis` attribute to control which axes to display
- improvements of polar plots axes, and better backend consistency
- changed the 'spy' recipe back to using heatmap
- added `scatterpath` seriestype
- allow plotlyjs to save svg
- add `reset_defaults()` function to reset plot defaults
- update syntax to 0.6
- make `fill = true` fill to 0 rather than to 1
- use new `@df` syntax in StatPlots examples
- allow changing the color of legend box
- implement `title_location` for gr
- add `hline` marker to pgfplots - fixes errorbars
- pyplot legends now show marker types
- pyplot colorbars take font style from y axis
- pyplot tickmarks color the same as axis color
- allow setting linewidth for contour in gr
- allow legend to be outside plot area for pgfplots
- expand axis extrema for heatmap
- extendg grid lines to axis limits
- fix `line_z` for pyplot and gr
- fixed colorbar problem for flipped axes with gr
- fix marker_z for 3d plots in gr
- fix `weights` functionality for histograms
- fix gr annotations with colorbar
- fix aspect ratio in gr
- fix "hidden window" problem after savefig in gr
- fix pgfplots logscale ticks error
- fix pgfplots legends symbols
- fix axis linking for plotlyjs
- fix plotting of grayscale images
-
-## 0.13.1
-
- fix a bug when passing a vector of functions with no bounds (e.g. `plot([sin, cos])`)
- export `pct` and `px` from Plots.PlotMeasures
-
-## 0.13.0
-
- support `plotattributes` rather than `d` in recipes
- no longer export `w`, `h` and names from Measures.jl; use `using Plots.PlotMeasures` to get these names back
- `bar_width` now depends on the minimum distance between bars, not the mean
- better automatic x axis limits for plotting Functions
- `tick_direction` attribute now allows ticks to be on the inside of the plot border
- removed a bug where `p1 = plot(randn(10)); plot(p1, p2)` made `display(p1)` impossible
- allow `plot([])` to generate an empty plot
- add `origin` framestyle
- ensure finite bin number on histograms with only one unique value
- better automatic histogram bins for 2d histograms
- more informative error message on passing unsupported seriestype in a recipe
- allow grouping in user recipes
- GR now has `line_z` and `fill_z` attributes for determining the color of shapes and lines
- change GR default view angle for 3D plots to match that of PyPlot
- fix `clims` on GR
- fix `marker_z` for plotly backend
- implement `framestyle` for plotly
- fix logscale bug error for values < 1e-16 on pyplot
- fix an issue on pyplot where >1 colorbar would be shown if there was >1 series
- fix `writemime` for eps
-
-## 0.12.4
-
- added a new `framestyle` argument with choices: :box, :semi, :axes, :grid and :none
- changed the default bar width to 0.8
- added working ribbon to plotly backend
- ensure that automatic ticks always generate 4 to 8 ticks
- group now groups keyword arguments of the same length as the input
- allow passing DateTime objects as ticks
- allow specifying the number of ticks as an integre
- fix bug on errorbars in gr
- fixed some but not all world age issues
- better margin with room for text
- added a `match` option for linecolor
- better error message un unsupported series types
- add a 'stride' keyword for the pyplot backend
-
-## 0.12.3
-
- new grid line style defaults
- `grid` is now an axis attribute and a magic argument: it is now possible to modify the grid line style, alpha and line width
- Enforce plot order in user recipes
- import `plot!` from RecipesBase
- GR no longer automatically handles _ and ^ in texts
- fix GR colorbar for scatter plots
-
-#### 0.12.2
-
- fix an issue with Juno/PlotlyJS compatibility on new installations
- fix markers not showing up in seriesrecipes using :scatter
- don't use pywrap in the pyplot backend
- improve the bottom margin for the gr backend
-
-#### 0.12.1
-
- fix deprecation warnings
- switch from FixedSizeArrays to StaticArrays.FixedSizeArrays
- drop FactCheck in tests
- remove julia 0.5 compliant uses of transpose operator
- fix GR heatmap bugs
- fix GR guide padding
- improve legend markers in GR
- add surface alpha for Plotly(JS)
- add fillrange to Plotly(JS)
- allow usage of Matplotlib 1.5 with PyPlot
- fix GLVisualize for julia 0.6
- conform to changes in InspectDR
-
-#### 0.12.0
-
- 0.6 only
-
-#### 0.11.3
-
- add HDF5 backend
- GR replaces PyPlot as first-choice backend
- support for legend position in GR
- smaller markers in GR
- better viewport size in GR
- fix glvisualize support
- remove bug with three-argument method of `text`
- `legendtitle` attribute added
- add test for `spy`
-
-#### 0.11.0
-
- julia 0.6 compatibility
- matplotlib 2.0 compatibility
- add inspectdr backend
- improved histogram functionality:
- added a `:stephist` and `:scatterhist` series type as well as ``:barhist` (the default)
- support for log scale axes with histograms
- support for plotting `StatsBase.Histogram`
- allowing bins to be specified as `:sturges`, `:rice`, `:scott` or :fd
- allow `normalization` to be specified as :density (for unequal bins) or :pdf (sum to 1)
- add a `plotattr` function to access documentation for Plots attribute
- add `fill_z` attribute for pyplot
- add colorbar_title to plotlyjs
- enable standalone window for plotlyjs
- improved support for pgfplots, ticks rotation, clims, series_annotations
- restore colorbars for GR
- better axis labels for heatmap in GR
- better marker sizes in GR
- fix color representation in GR
- update GR legend
- fix image bug on GR
- fix glvisualize dependencies
- set dotted grid lines for pyplot
- several improvements to inspectdr
- improved tick positions for TimeType x axes
- support for improved color gradient capability in PlotUtils
- add a showlibrary recipe to display color libraries
- add a showgradient recipe to display color gradients
- add `vectorfield` as an alias for `quiver`
- use `PlotUtils.adaptedgrid` for functions

+## 0.9 (current master/dev)

 #### 0.9.5

@@ -500,7 +331,7 @@
 - z-axis keywords
 - 3D indexing overhaul: `push!`, `append!` support
 - matplotlib colormap constants (`:inferno` is the new default colormap for Plots)
- `const KW = Dict{Symbol,Any}` used in place of splatting in many places
+- `typealias KW Dict{Symbol,Any}` used in place of splatting in many places
 - png generation for plotly backend using wkhtmltoimage
 - `normalize` and `weights` keywords
 - background/foreground subcategories for fine-tuning of looks
@@ -1,16 +1,13 @@
 # Plots

-[![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)
+[![Build Status](https://travis-ci.org/tbreloff/Plots.jl.svg?branch=master)](https://travis-ci.org/tbreloff/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)
 <!-- [![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 [JuliaPlot members](https://github.com/orgs/JuliaPlots/people)
+#### Author: Thomas Breloff (@tbreloff)

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

@@ -22,4 +19,4 @@ Plots is a plotting API and toolset.  My goals with the package are:
 - **Lightweight**.  Very few dependencies.
 - **Smart**. Attempts to figure out what you **want** it to do... not just what you **tell** it.

-View the [full documentation](http://docs.juliaplots.org/latest).
+View the [full documentation](http://juliaplots.github.io).
@@ -1,15 +1,9 @@
-julia 0.6
+julia 0.5

-RecipesBase 0.2.3
-PlotUtils 0.4.1
-PlotThemes 0.1.3
+RecipesBase
+PlotUtils
+PlotThemes
 Reexport
-StaticArrays 0.5
-FixedPointNumbers 0.3
 Measures
 Showoff
-StatsBase 0.14.0
-JSON
-NaNMath
-Requires
-Contour
+StaticArrays
@@ -1,15 +1,9 @@
 environment:
  matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
-
-matrix:
-  allow_failures:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe" #check and address
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
+  - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
+  - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"

 notifications:
  - provider: Email
@@ -18,14 +12,13 @@ notifications:
    on_build_status_changed: false

 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
 # If there's a newer build queued for the same PR, cancel this one
  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
        throw "There are newer queued builds for this pull request, failing early." }
 # Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile($env:JULIA_URL, "C:\projects\julia-binary.exe")
+  - ps: (new-object net.webclient).DownloadFile($("http://s3.amazonaws.com/"+$env:JULIAVERSION), "C:\projects\julia-binary.exe")
 # Run installer silently, output to C:\projects\julia
  - C:\projects\julia-binary.exe /S /D=C:\projects\julia

@@ -1,21 +1,14 @@
-__precompile__(false)
+__precompile__(true)

 module Plots

 using Reexport
-
-import StaticArrays
-using StaticArrays.FixedSizeArrays
-
+using StaticArrays
@reexport using RecipesBase
-import RecipesBase: plot, plot!, animate
 using Base.Meta
@reexport using PlotUtils
@reexport using PlotThemes
 import Showoff
-import StatsBase
-
-using Requires

 export
    grid,
@@ -36,6 +29,9 @@ export
    with,
    twinx,

+    @userplot,
+    @shorthands,
+
    pie,
    pie!,
    plot3d,
@@ -54,8 +50,6 @@ export
    yflip!,
    xaxis!,
    yaxis!,
-    xgrid!,
-    ygrid!,

    xlims,
    ylims,
@@ -105,50 +99,15 @@ export
    center,
    P2,
    P3,
-    BezierCurve,
-
-    plotattr
+    BezierCurve

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

-import NaNMath # define functions that ignores NaNs. To overcome the destructive effects of https://github.com/JuliaLang/julia/pull/12563
-ignorenan_minimum(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.minimum(x)
-ignorenan_minimum(x) = Base.minimum(x)
-ignorenan_maximum(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.maximum(x)
-ignorenan_maximum(x) = Base.maximum(x)
-ignorenan_mean(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.mean(x)
-ignorenan_mean(x) = Base.mean(x)
-ignorenan_extrema(x::AbstractArray{F}) where {F<:AbstractFloat} = NaNMath.extrema(x)
-ignorenan_extrema(x) = Base.extrema(x)
-
-# ---------------------------------------------------------
-
-# to cater for block matrices, Base.transpose is recursive.
-# This makes it impossible to create row vectors of String and Symbol with the transpose operator.
-# This solves this issue, internally in Plots at least.
-
-
-# commented out on the insistence of the METADATA maintainers
-
-#Base.transpose(x::Symbol) = x
-#Base.transpose(x::String) = x
-
-# ---------------------------------------------------------
-
-import Measures
-module PlotMeasures
 import Measures
 import Measures: Length, AbsoluteLength, Measure, BoundingBox, mm, cm, inch, pt, width, height, w, h
-const BBox = Measures.Absolute2DBox
+typealias BBox Measures.Absolute2DBox
+export BBox, BoundingBox, mm, cm, inch, pt, px, pct, w, h

-# allow pixels and percentages
-const px = AbsoluteLength(0.254)
-const pct = Length{:pct, Float64}(1.0)
-export BBox, BoundingBox, mm, cm, inch, px, pct, pt, w, h
-end
-
-using .PlotMeasures
-import .PlotMeasures: Length, AbsoluteLength, Measure, width, height
 # ---------------------------------------------------------

 include("types.jl")
@@ -156,6 +115,7 @@ include("utils.jl")
 include("components.jl")
 include("axes.jl")
 include("args.jl")
+include("backends.jl")
 include("themes.jl")
 include("plot.jl")
 include("pipeline.jl")
@@ -164,21 +124,27 @@ include("layouts.jl")
 include("subplots.jl")
 include("recipes.jl")
 include("animation.jl")
+include("output.jl")
 include("examples.jl")
 include("arg_desc.jl")
-include("plotattr.jl")
-include("backends.jl")
-include("output.jl")
+

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

+# define and export shorthand plotting method definitions
+macro shorthands(funcname::Symbol)
+    funcname2 = Symbol(funcname, "!")
+    esc(quote
+        export $funcname, $funcname2
+        $funcname(args...; kw...) = plot(args...; kw..., seriestype = $(quot(funcname)))
+        $funcname2(args...; kw...) = plot!(args...; kw..., seriestype = $(quot(funcname)))
+    end)
+end
+
@shorthands scatter
@shorthands bar
@shorthands barh
@shorthands histogram
-@shorthands barhist
-@shorthands stephist
-@shorthands scatterhist
@shorthands histogram2d
@shorthands density
@shorthands heatmap
@@ -199,86 +165,52 @@ include("output.jl")
@shorthands quiver
@shorthands curves

-"Plot a pie diagram"
 pie(args...; kw...)        = plot(args...; kw...,  seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
 pie!(args...; kw...)       = plot!(args...; kw..., seriestype = :pie, aspect_ratio = :equal, grid=false, xticks=nothing, yticks=nothing)
-
-"Plot with seriestype :path3d"
 plot3d(args...; kw...)     = plot(args...; kw...,  seriestype = :path3d)
 plot3d!(args...; kw...)    = plot!(args...; kw..., seriestype = :path3d)

-"Add title to an existing plot"
+
 title!(s::AbstractString; kw...)                 = plot!(; title = s, kw...)
-
-"Add xlabel to an existing plot"
 xlabel!(s::AbstractString; kw...)                = plot!(; xlabel = s, kw...)
-
-"Add ylabel to an existing plot"
 ylabel!(s::AbstractString; kw...)                = plot!(; ylabel = s, kw...)
-
-"Set xlims for an existing plot"
-xlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; xlims = lims, kw...)
-
-"Set ylims for an existing plot"
-ylims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; ylims = lims, kw...)
-
-"Set zlims for an existing plot"
-zlims!(lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real} = plot!(; zlims = lims, kw...)
-
+xlims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; xlims = lims, kw...)
+ylims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; ylims = lims, kw...)
+zlims!{T<:Real,S<:Real}(lims::Tuple{T,S}; kw...) = plot!(; zlims = lims, kw...)
 xlims!(xmin::Real, xmax::Real; kw...)                     = plot!(; xlims = (xmin,xmax), kw...)
 ylims!(ymin::Real, ymax::Real; kw...)                     = plot!(; ylims = (ymin,ymax), kw...)
 zlims!(zmin::Real, zmax::Real; kw...)                     = plot!(; zlims = (zmin,zmax), kw...)
-
-
-"Set xticks for an existing plot"
-xticks!(v::AVec{T}; kw...) where {T<:Real}                       = plot!(; xticks = v, kw...)
-
-"Set yticks for an existing plot"
-yticks!(v::AVec{T}; kw...) where {T<:Real}                       = plot!(; yticks = v, kw...)
-
-xticks!(
-ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; xticks = (ticks,labels), kw...)
-yticks!(
-ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(; yticks = (ticks,labels), kw...)
-
-"Add annotations to an existing plot"
+xticks!{T<:Real}(v::AVec{T}; kw...)                       = plot!(; xticks = v, kw...)
+yticks!{T<:Real}(v::AVec{T}; kw...)                       = plot!(; yticks = v, kw...)
+xticks!{T<:Real,S<:AbstractString}(
+              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(; xticks = (ticks,labels), kw...)
+yticks!{T<:Real,S<:AbstractString}(
+              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(; yticks = (ticks,labels), 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"
+annotate!{T<:Tuple}(anns::AVec{T}; kw...)                 = plot!(; annotation = anns, kw...)
 xflip!(flip::Bool = true; kw...)                          = plot!(; xflip = flip, kw...)
-
-"Flip the current plots' y axis"
 yflip!(flip::Bool = true; kw...)                          = plot!(; yflip = flip, kw...)
-
-"Specify x axis attributes for an existing plot"
 xaxis!(args...; kw...)                                    = plot!(; xaxis = args, kw...)
-
-"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...)

 let PlotOrSubplot = Union{Plot, Subplot}
    title!(plt::PlotOrSubplot, s::AbstractString; kw...)                  = plot!(plt; title = s, kw...)
    xlabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; xlabel = s, kw...)
    ylabel!(plt::PlotOrSubplot, s::AbstractString; kw...)                 = plot!(plt; ylabel = s, kw...)
-    xlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; xlims = lims, kw...)
-    ylims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; ylims = lims, kw...)
-    zlims!(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...) where {T<:Real,S<:Real}  = plot!(plt; zlims = lims, kw...)
+    xlims!{T<:Real,S<:Real}(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...)  = plot!(plt; xlims = lims, kw...)
+    ylims!{T<:Real,S<:Real}(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...)  = plot!(plt; ylims = lims, kw...)
+    zlims!{T<:Real,S<:Real}(plt::PlotOrSubplot, lims::Tuple{T,S}; kw...)  = plot!(plt; zlims = lims, kw...)
    xlims!(plt::PlotOrSubplot, xmin::Real, xmax::Real; kw...)             = plot!(plt; xlims = (xmin,xmax), kw...)
    ylims!(plt::PlotOrSubplot, ymin::Real, ymax::Real; kw...)             = plot!(plt; ylims = (ymin,ymax), kw...)
    zlims!(plt::PlotOrSubplot, zmin::Real, zmax::Real; kw...)             = plot!(plt; zlims = (zmin,zmax), kw...)
-    xticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; xticks = ticks, kw...)
-    yticks!(plt::PlotOrSubplot, ticks::AVec{T}; kw...) where {T<:Real}           = plot!(plt; yticks = ticks, kw...)
-    xticks!(plt::PlotOrSubplot,
-   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; xticks = (ticks,labels), kw...)
-    yticks!(plt::PlotOrSubplot,
-   ticks::AVec{T}, labels::AVec{S}; kw...) where {T<:Real,S<:AbstractString}     = plot!(plt; yticks = (ticks,labels), kw...)
-    xgrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; xgrid = args, kw...)
-    ygrid!(plt::PlotOrSubplot, args...; kw...)                  = plot!(plt; ygrid = args, kw...)
+    xticks!{T<:Real}(plt::PlotOrSubplot, ticks::AVec{T}; kw...)           = plot!(plt; xticks = ticks, kw...)
+    yticks!{T<:Real}(plt::PlotOrSubplot, ticks::AVec{T}; kw...)           = plot!(plt; yticks = ticks, kw...)
+    xticks!{T<:Real,S<:AbstractString}(plt::PlotOrSubplot,
+                              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(plt; xticks = (ticks,labels), kw...)
+    yticks!{T<:Real,S<:AbstractString}(plt::PlotOrSubplot,
+                              ticks::AVec{T}, labels::AVec{S}; kw...)     = plot!(plt; yticks = (ticks,labels), kw...)
    annotate!(plt::PlotOrSubplot, anns...; kw...)                         = plot!(plt; annotation = anns, kw...)
-    annotate!(plt::PlotOrSubplot, anns::AVec{T}; kw...) where {T<:Tuple}         = plot!(plt; annotation = anns, kw...)
+    annotate!{T<:Tuple}(plt::PlotOrSubplot, anns::AVec{T}; kw...)         = plot!(plt; annotation = anns, kw...)
    xflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; xflip = flip, kw...)
    yflip!(plt::PlotOrSubplot, flip::Bool = true; kw...)                  = plot!(plt; yflip = flip, kw...)
    xaxis!(plt::PlotOrSubplot, args...; kw...)                            = plot!(plt; xaxis = args, kw...)
@@ -290,8 +222,10 @@ end

 const CURRENT_BACKEND = CurrentBackend(:none)

-# for compatibility with Requires.jl:
-@init begin
+function __init__()
+    setup_ijulia()
+    setup_atom()
+
    if isdefined(Main, :PLOTS_DEFAULTS)
        for (k,v) in Main.PLOTS_DEFAULTS
            default(k, v)
@@ -1,5 +1,5 @@
-"Represents an animation object"
-struct Animation
+
+immutable Animation
    dir::String
    frames::Vector{String}
 end
@@ -9,12 +9,7 @@ function Animation()
    Animation(tmpdir, String[])
 end

-"""
-    frame(animation[, plot])
-
-Add a plot (the current plot if not specified) to an existing animation
-"""
-function frame(anim::Animation, plt::P=current()) where P<:AbstractPlot
+function frame{P<:AbstractPlot}(anim::Animation, plt::P=current())
    i = length(anim.frames) + 1
    filename = @sprintf("%06d.png", i)
    png(plt, joinpath(anim.dir, filename))
@@ -25,7 +20,7 @@ giffn() = (isijulia() ? "tmp.gif" : tempname()*".gif")
 movfn() = (isijulia() ? "tmp.mov" : tempname()*".mov")
 mp4fn() = (isijulia() ? "tmp.mp4" : tempname()*".mp4")

-mutable struct FrameIterator
+type FrameIterator
    itr
    every::Int
    kw
@@ -54,36 +49,43 @@ end
 # -----------------------------------------------

 "Wraps the location of an animated gif so that it can be displayed"
-struct AnimatedGif
+immutable AnimatedGif
    filename::String
 end

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

 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...)
+mov(anim::Animation, fn = movfn(); kw...) = buildanimation(anim.dir, fn; kw...)
+mp4(anim::Animation, fn = mp4fn(); kw...) = buildanimation(anim.dir, fn; kw...)

+const _imagemagick_initialized = Ref(false)

-function buildanimation(animdir::AbstractString, fn::AbstractString,
-                        is_animated_gif::Bool=true;
-                        fps::Integer = 20, loop::Integer = 0,
-                        variable_palette::Bool=false)
+function buildanimation(animdir::AbstractString, fn::AbstractString;
+                        fps::Integer = 20, loop::Integer = 0)
    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"
-            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
-            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
-            run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -i "$(animdir)/palette.bmp" -lavfi "paletteuse=dither=sierra2_4a" -y $fn`)
+    try
+        if !_imagemagick_initialized[]
+            file = joinpath(Pkg.dir("ImageMagick"), "deps","deps.jl")
+            if isfile(file) && !haskey(ENV, "MAGICK_CONFIGURE_PATH")
+                include(file)
+            end
+            _imagemagick_initialized[] = true
        end
-    else
-        run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -pix_fmt yuv420p -y $fn`)
+
+        # prefix = get(ENV, "MAGICK_CONFIGURE_PATH", "")
+        # high quality
+        speed = round(Int, 100 / fps)
+        run(`convert -delay $speed -loop $loop $(joinpath(animdir, "*.png")) -alpha off $fn`)
+
+    catch err
+        warn("""Tried to create gif using convert (ImageMagick), but got error: $err
+            ImageMagick can be installed by executing `Pkg.add("ImageMagick")`
+            Will try ffmpeg, but it's lower quality...)""")
+
+        # low quality
+        run(`ffmpeg -v 0 -framerate $fps -loop $loop -i $(animdir)/%06d.png -y $fn`)
+        # run(`ffmpeg -v warning -i  "fps=$fps,scale=320:-1:flags=lanczos"`)
    end

    info("Saved animation to ", fn)
@@ -21,7 +21,7 @@ const _arg_desc = KW(
 :markerstrokewidth 	=> "Number. Width of the marker stroke (border. in pixels)",
 :markerstrokecolor 	=> "Color Type. Color of the marker stroke (border).  `:match` will take the value from `:foreground_color_subplot`.",
 :markerstrokealpha 	=> "Number in [0,1]. The alpha/opacity override for the marker stroke (border).  `nothing` (the default) means it will take the alpha value of markerstrokecolor.",
-:bins              	=> "Integer, NTuple{2,Integer}, AbstractVector or Symbol. Default is :auto (the Freedman-Diaconis rule). For histogram-types, defines the approximate number of bins to aim for, or the auto-binning algorithm to use (:sturges, :sqrt, :rice, :scott or :fd). For fine-grained control pass a Vector of break values, e.g. `linspace(extrema(x)..., 25)`",
+:bins              	=> "Integer, NTuple{2,Integer}, AbstractVector. For histogram-types, defines the number of bins, or the edges, of the histogram.",
 :smooth            	=> "Bool.  Add a regression line?",
 :group             	=> "AbstractVector. Data is split into a separate series, one for each unique value in `group`.",
 :x                 	=> "Various. Input data. First Dimension",
@@ -40,7 +40,7 @@ const _arg_desc = KW(
 :ribbon            	=> "Number or AbstractVector.  Creates a fillrange around the data points.",
 :quiver            	=> "AbstractVector or 2-Tuple of vectors.  The directional vectors U,V which specify velocity/gradient vectors for a quiver plot.",
 :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).",
+:normalize         	=> "Bool. Should normalize histogram types?  Trying for area == 1.",
 :weights           	=> "AbstractVector. Used in histogram types for weighted counts.",
 :contours          	=> "Bool. Add contours to the side-grids of 3D plots?  Used in surface/wireframe.",
 :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`.",
@@ -66,34 +66,24 @@ const _arg_desc = KW(
 :dpi 					  => "Number.  Dots Per Inch of output figures",
 :display_type 			  => "Symbol (`:auto`, `:gui`, or `:inline`).  When supported, `display` will either open a GUI window or plot inline.",
 :extra_kwargs 			  => "KW (Dict{Symbol,Any}).  Pass a map of extra keyword args which may be specific to a backend.",
-:fontfamily               => "String or Symbol.  Default font family for title, legend entries, tick labels and guides",

 # subplot args
 :title                    => "String. Subplot title.",
 :title_location           => "Symbol. Position of subplot title. Values: `:left`, `:center`, `:right`",
-:titlefontfamily          => "String or Symbol. Font family of subplot title.",
-:titlefontsize            => "Integer. Font pointsize of subplot title.",
-:titlefonthalign          => "Symbol. Font horizontal alignment of subplot title: :hcenter, :left, :right or :center",
-:titlefontvalign          => "Symbol. Font vertical alignment of subplot title: :vcenter, :top, :bottom or :center",
-:titlefontrotation        => "Real. Font rotation of subplot title",
-:titlefontcolor           => "Color Type. Font color of subplot title",
+:titlefont                => "Font. Font of subplot title.",
 :background_color_subplot => "Color Type or `:match` (matches `:background_color`).  Base background color of the subplot.",
 :background_color_legend  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color of the legend.",
 :background_color_inside  => "Color Type or `:match` (matches `:background_color_subplot`).  Background color inside the plot area (under the grid).",
 :foreground_color_subplot => "Color Type or `:match` (matches `:foreground_color`).  Base foreground color of the subplot.",
 :foreground_color_legend  => "Color Type or `:match` (matches `:foreground_color_subplot`).  Foreground color of the legend.",
+:foreground_color_grid    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
 :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` (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",
 :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.",
+:grid                     => "Bool. Show the grid lines?",
 :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 `apect_ratio` x-units.",
@@ -104,8 +94,6 @@ const _arg_desc = KW(
 :bottom_margin            => "Measure (multiply by `mm`, `px`, etc) or `:match` (matches `:margin`).  Specifies the extra padding on the bottom of the subplot.",
 :subplot_index            => "Integer.  Internal (not set by user).  Specifies the index of this subplot in the Plot's `plt.subplot` list.",
 :colorbar_title           => "String.  Title of colorbar.",
-:framestyle               => "Symbol.  Style of the axes frame. Choose from $(_allFramestyles)",
-:camera                   => "NTuple{2, Real}. Sets the view angle (azimuthal, elevation) for 3D plots",

 # axis args
 :guide     				  => "String. Axis guide (label).",
@@ -115,28 +103,12 @@ const _arg_desc = KW(
 :rotation  				  => "Number. Degrees rotation of tick labels.",
 :flip      				  => "Bool.  Should we flip (reverse) the axis?",
 :formatter 				  => "Function, :scientific, or :auto. A method which converts a number to a string for tick labeling.",
-:tickfontfamily           => "String or Symbol. Font family of tick labels.",
-:tickfontsize             => "Integer. Font pointsize of tick labels.",
-:tickfonthalign           => "Symbol. Font horizontal alignment of tick labels: :hcenter, :left, :right or :center",
-:tickfontvalign           => "Symbol. Font vertical alignment of tick labels: :vcenter, :top, :bottom or :center",
-:tickfontrotation         => "Real. Font rotation of tick labels",
-:tickfontcolor            => "Color Type. Font color of tick labels",
-:guidefontfamily          => "String or Symbol. Font family of axes guides.",
-:guidefontsize            => "Integer. Font pointsize of axes guides.",
-:guidefonthalign          => "Symbol. Font horizontal alignment of axes guides: :hcenter, :left, :right or :center",
-:guidefontvalign          => "Symbol. Font vertical alignment of axes guides: :vcenter, :top, :bottom or :center",
-:guidefontrotation        => "Real. Font rotation of axes guides",
-:guidefontcolor           => "Color Type. Font color of axes guides",
+:tickfont  				  => "Font. Font of axis tick labels.",
+:guidefont 				  => "Font. Font of axis guide (label).",
 :foreground_color_axis    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis ticks.",
 :foreground_color_border  => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of plot area border (spines).",
 :foreground_color_text    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of tick labels.",
 :foreground_color_guide   => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of axis guides (axis labels).",
 :mirror                   => "Bool.  Switch the side of the tick labels (right or top).",
-:grid                     => "Bool, Symbol, String or `nothing`. Show the grid lines? `true`, `false`, `:show`, `:hide`, `:yes`, `:no`, `:x`, `:y`, `:z`, `:xy`, ..., `:all`, `:none`, `:off`",
-:foreground_color_grid    => "Color Type or `:match` (matches `:foreground_color_subplot`). Color of grid lines.",
-:gridalpha                => "Number in [0,1]. The alpha/opacity override for the grid lines.",
-:gridstyle                => "Symbol. Style of the grid lines. Choose from $(_allStyles)",
-:gridlinewidth            => "Number. Width of the grid lines (in pixels)",
-: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`"
+
 )
@@ -35,9 +35,7 @@ const _3dTypes = [
 ]
 const _allTypes = vcat([
    :none, :line, :path, :steppre, :steppost, :sticks, :scatter,
-    :heatmap, :hexbin, :barbins, :barhist, :histogram, :scatterbins,
-    :scatterhist, :stepbins, :stephist, :bins2d, :histogram2d, :histogram3d,
-    :density, :bar, :hline, :vline,
+    :heatmap, :hexbin, :histogram, :histogram2d, :histogram3d, :density, :bar, :hline, :vline,
    :contour, :pie, :shape, :image
 ], _3dTypes)

@@ -67,7 +65,6 @@ const _typeAliases = Dict{Symbol,Symbol}(
    :polygon       => :shape,
    :box           => :boxplot,
    :velocity      => :quiver,
-    :vectorfield   => :quiver,
    :gradient      => :quiver,
    :img           => :image,
    :imshow        => :image,
@@ -80,13 +77,9 @@ const _typeAliases = Dict{Symbol,Symbol}(

 add_non_underscore_aliases!(_typeAliases)

-const _histogram_like = [:histogram, :barhist, :barbins]
-const _line_like = [:line, :path, :steppre, :steppost]
-const _surface_like = [:contour, :contourf, :contour3d, :heatmap, :surface, :wireframe, :image]
-
-like_histogram(seriestype::Symbol) = seriestype in _histogram_like
-like_line(seriestype::Symbol)      = seriestype in _line_like
-like_surface(seriestype::Symbol)   = seriestype in _surface_like
+like_histogram(seriestype::Symbol) = seriestype in (:histogram, :density)
+like_line(seriestype::Symbol)      = seriestype in (:line, :path, :steppre, :steppost)
+like_surface(seriestype::Symbol)   = seriestype in (:contour, :contourf, :contour3d, :heatmap, :surface, :wireframe, :image)

 is3d(seriestype::Symbol) = seriestype in _3dTypes
 is3d(series::Series) = is3d(series.d)
@@ -160,59 +153,11 @@ const _markerAliases = Dict{Symbol,Symbol}(
 )

 const _allScales = [:identity, :ln, :log2, :log10, :asinh, :sqrt]
-const _logScales = [:ln, :log2, :log10]
-const _logScaleBases = Dict(:ln => e, :log2 => 2.0, :log10 => 10.0)
 const _scaleAliases = Dict{Symbol,Symbol}(
    :none => :identity,
    :log  => :log10,
 )

-const _allGridSyms = [:x, :y, :z,
-                    :xy, :xz, :yx, :yz, :zx, :zy,
-                    :xyz, :xzy, :yxz, :yzx, :zxy, :zyx,
-                    :all, :both, :on, :yes, :show,
-                    :none, :off, :no, :hide]
-const _allGridArgs = [_allGridSyms; string.(_allGridSyms); nothing]
-hasgrid(arg::Void, letter) = false
-hasgrid(arg::Bool, letter) = arg
-function hasgrid(arg::Symbol, letter)
-    if arg in _allGridSyms
-        arg in (:all, :both, :on) || contains(string(arg), string(letter))
-    else
-        warn("Unknown grid argument $arg; $(Symbol(letter, :grid)) was set to `true` instead.")
-        true
-    end
-end
-hasgrid(arg::AbstractString, letter) = hasgrid(Symbol(arg), letter)
-
-const _allShowaxisSyms = [:x, :y, :z,
-                    :xy, :xz, :yx, :yz, :zx, :zy,
-                    :xyz, :xzy, :yxz, :yzx, :zxy, :zyx,
-                    :all, :both, :on, :yes, :show,
-                    :off, :no, :hide]
-const _allShowaxisArgs = [_allGridSyms; string.(_allGridSyms)]
-showaxis(arg::Void, letter) = false
-showaxis(arg::Bool, letter) = arg
-function showaxis(arg::Symbol, letter)
-    if arg in _allGridSyms
-        arg in (:all, :both, :on, :yes) || contains(string(arg), string(letter))
-    else
-        warn("Unknown showaxis argument $arg; $(Symbol(letter, :showaxis)) was set to `true` instead.")
-        true
-    end
-end
-showaxis(arg::AbstractString, letter) = hasgrid(Symbol(arg), letter)
-
-const _allFramestyles = [:box, :semi, :axes, :origin, :zerolines, :grid, :none]
-const _framestyleAliases = Dict{Symbol, Symbol}(
-    :frame              => :box,
-    :border             => :box,
-    :on                 => :box,
-    :transparent        => :semi,
-    :semitransparent    => :semi,
-)
-
-const _bar_width = 0.8
 # -----------------------------------------------------------------------------

 const _series_defaults = KW(
@@ -222,7 +167,7 @@ const _series_defaults = KW(
    :seriestype        => :path,
    :linestyle         => :solid,
    :linewidth         => :auto,
-    :linecolor         => :auto,
+    :linecolor         => :match,
    :linealpha         => nothing,
    :fillrange         => nothing,   # ribbons, areas, etc
    :fillcolor         => :match,
@@ -235,7 +180,7 @@ const _series_defaults = KW(
    :markerstrokewidth => 1,
    :markerstrokecolor => :match,
    :markerstrokealpha => nothing,
-    :bins              => :auto,        # number of bins for hists
+    :bins              => 30,        # number of bins for hists
    :smooth            => false,     # regression line?
    :group             => nothing,   # groupby vector
    :x                 => nothing,
@@ -264,7 +209,6 @@ const _series_defaults = KW(
    :primary            => true,     # when true, this "counts" as a series for color selection, etc.  the main use is to allow
                                     #     one logical series to be broken up (path and markers, for example)
    :hover              => nothing,  # text to display when hovering over the data points
-    :stride             => (1,1),    # array stride for wireframe/surface, the first element is the row stride and the second is the column stride.
 )


@@ -273,7 +217,6 @@ const _plot_defaults = KW(
    :background_color            => colorant"white",   # default for all backgrounds,
    :background_color_outside    => :match,            # background outside grid,
    :foreground_color            => :auto,             # default for all foregrounds, and title color,
-    :fontfamily                  => "sans-serif",
    :size                        => (600,400),
    :pos                         => (0,0),
    :window_title                 => "Plots.jl",
@@ -293,30 +236,20 @@ const _plot_defaults = KW(
 const _subplot_defaults = KW(
    :title                    => "",
    :title_location           => :center,           # also :left or :right
-    :fontfamily_subplot       => :match,
-    :titlefontfamily          => :match,
-    :titlefontsize            => 14,
-    :titlefonthalign          => :hcenter,
-    :titlefontvalign          => :vcenter,
-    :titlefontrotation        => 0.0,
-    :titlefontcolor           => :match,
+    :titlefont                => font(14),
    :background_color_subplot => :match,            # default for other bg colors... match takes plot default
    :background_color_legend  => :match,            # background of legend
    :background_color_inside  => :match,            # background inside grid
    :foreground_color_subplot => :match,            # default for other fg colors... match takes plot default
    :foreground_color_legend  => :match,            # foreground of legend
+    :foreground_color_grid    => :match,            # grid color
    :foreground_color_title   => :match,            # title color
    :color_palette            => :auto,
    :legend                   => :best,
-    :legendtitle              => nothing,
    :colorbar                 => :legend,
    :clims                    => :auto,
-    :legendfontfamily         => :match,
-    :legendfontsize           => 8,
-    :legendfonthalign         => :hcenter,
-    :legendfontvalign         => :vcenter,
-    :legendfontrotation       => 0.0,
-    :legendfontcolor          => :match,
+    :legendfont               => font(8),
+    :grid                     => true,
    :annotations              => [],                # annotation tuples... list of (x,y,annotation)
    :projection               => :none,             # can also be :polar or :3d
    :aspect_ratio             => :none,             # choose from :none or :equal
@@ -327,8 +260,6 @@ const _subplot_defaults = KW(
    :bottom_margin            => :match,
    :subplot_index            => -1,
    :colorbar_title           => "",
-    :framestyle               => :axes,
-    :camera                   => (30,30),
 )

 const _axis_defaults = KW(
@@ -339,18 +270,8 @@ const _axis_defaults = KW(
    :rotation  => 0,
    :flip      => false,
    :link      => [],
-    :tickfontfamily         => :match,
-    :tickfontsize           => 8,
-    :tickfonthalign         => :hcenter,
-    :tickfontvalign         => :vcenter,
-    :tickfontrotation       => 0.0,
-    :tickfontcolor          => :match,
-    :guidefontfamily         => :match,
-    :guidefontsize           => 11,
-    :guidefonthalign         => :hcenter,
-    :guidefontvalign         => :vcenter,
-    :guidefontrotation       => 0.0,
-    :guidefontcolor          => :match,
+    :tickfont  => font(8),
+    :guidefont => font(11),
    :foreground_color_axis   => :match,            # axis border/tick colors,
    :foreground_color_border => :match,            # plot area border/spines,
    :foreground_color_text   => :match,            # tick text color,
@@ -358,13 +279,6 @@ const _axis_defaults = KW(
    :discrete_values => [],
    :formatter => :auto,
    :mirror => false,
-    :grid                     => true,
-    :foreground_color_grid    => :match,            # grid color
-    :gridalpha                => 0.1,
-    :gridstyle                => :solid,
-    :gridlinewidth            => 0.5,
-    :tick_direction           => :in,
-    :showaxis                 => true,
 )

 const _suppress_warnings = Set{Symbol}([
@@ -416,15 +330,6 @@ const _all_defaults = KW[
    _axis_defaults_byletter
 ]

-const _initial_defaults = deepcopy(_all_defaults)
-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],
-                                :tickfontsize   => _axis_defaults[:tickfontsize],
-                                :guidefontsize  => _axis_defaults[:guidefontsize])
-
 const _all_args = sort(collect(union(map(keys, _all_defaults)...)))

 RecipesBase.is_key_supported(k::Symbol) = is_attr_supported(k)
@@ -485,7 +390,7 @@ add_aliases(:foreground_color_title, :fg_title, :fgtitle, :fgcolor_title, :fg_co
 add_aliases(:foreground_color_axis, :fg_axis, :fgaxis, :fgcolor_axis, :fg_color_axis, :foreground_axis,
                            :foreground_colour_axis, :fgcolour_axis, :fg_colour_axis, :axiscolor)
 add_aliases(:foreground_color_border, :fg_border, :fgborder, :fgcolor_border, :fg_color_border, :foreground_border,
-                            :foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor)
+                            :foreground_colour_border, :fgcolour_border, :fg_colour_border, :bordercolor, :border)
 add_aliases(:foreground_color_text, :fg_text, :fgtext, :fgcolor_text, :fg_color_text, :foreground_text,
                            :foreground_colour_text, :fgcolour_text, :fg_colour_text, :textcolor)
 add_aliases(:foreground_color_guide, :fg_guide, :fgguide, :fgcolor_guide, :fg_color_guide, :foreground_guide,
@@ -497,7 +402,6 @@ add_aliases(:linealpha, :la, :lalpha, :lα, :lineopacity, :lopacity)
 add_aliases(:markeralpha, :ma, :malpha, :mα, :markeropacity, :mopacity)
 add_aliases(:markerstrokealpha, :msa, :msalpha, :msα, :markerstrokeopacity, :msopacity)
 add_aliases(:fillalpha, :fa, :falpha, :fα, :fillopacity, :fopacity)
-add_aliases(:gridalpha, :ga, :galpha, :gα, :gridopacity, :gopacity)

 # series attributes
 add_aliases(:seriestype, :st, :t, :typ, :linetype, :lt)
@@ -530,7 +434,6 @@ add_aliases(:zticks, :ztick)
 add_aliases(:zrotation, :zrot, :zr)
 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)
 add_aliases(:colorbar, :cb, :cbar, :colorkey)
 add_aliases(:clims, :clim, :cbarlims, :cbar_lims, :climits, :color_limits)
 add_aliases(:smooth, :regression, :reg)
@@ -542,7 +445,7 @@ 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(:quiver, :velocity, :quiver2d, :gradient, :vectorfield)
+add_aliases(:quiver, :velocity, :quiver2d, :gradient)
 add_aliases(:normalize, :norm, :normed, :normalized)
 add_aliases(:aspect_ratio, :aspectratio, :axis_ratio, :axisratio, :ratio)
 add_aliases(:match_dimensions, :transpose, :transpose_z)
@@ -553,12 +456,7 @@ add_aliases(:series_annotations, :series_ann, :seriesann, :series_anns, :seriesa
 add_aliases(:html_output_format, :format, :fmt, :html_format)
 add_aliases(:orientation, :direction, :dir)
 add_aliases(:inset_subplots, :inset, :floating)
-add_aliases(:stride, :wirefame_stride, :surface_stride, :surf_str, :str)
-add_aliases(:gridlinewidth, :gridwidth, :grid_linewidth, :grid_width, :gridlw, :grid_lw)
-add_aliases(:gridstyle, :grid_style, :gridlinestyle, :grid_linestyle, :grid_ls, :gridls)
-add_aliases(:framestyle, :frame_style, :frame, :axesstyle, :axes_style, :boxstyle, :box_style, :box, :borderstyle, :border_style, :border)
-add_aliases(:tick_direction, :tickdirection, :tick_dir, :tickdir, :tick_orientation, :tickorientation, :tick_or, :tickor)
-add_aliases(:camera, :cam, :viewangle, :view_angle)
+

 # add all pluralized forms to the _keyAliases dict
 for arg in keys(_series_defaults)
@@ -577,6 +475,7 @@ end
 `default(; kw...)` will set the current default value for each key/value pair
 `default(d, key)` returns the key from d if it exists, otherwise `default(key)`
 """
+
 function default(k::Symbol)
    k = get(_keyAliases, k, k)
    for defaults in _all_defaults
@@ -606,8 +505,6 @@ function default(k::Symbol, v)
 end

 function default(; kw...)
-    kw = KW(kw)
-    preprocessArgs!(kw)
    for (k,v) in kw
        default(k, v)
    end
@@ -617,10 +514,7 @@ function default(d::KW, k::Symbol)
    get(d, k, default(k))
 end

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

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

@@ -723,9 +617,6 @@ function processFillArg(d::KW, arg)
        arg.color == nothing || (d[:fillcolor] = arg.color == :auto ? :auto : plot_color(arg.color))
        arg.alpha == nothing || (d[:fillalpha] = arg.alpha)

-    elseif typeof(arg) <: Bool
-        d[:fillrange] = arg ? 0 : nothing
-
    # fillrange function
    elseif allFunctions(arg)
        d[:fillrange] = arg
@@ -742,68 +633,6 @@ function processFillArg(d::KW, arg)
    return
 end

-
-function processGridArg!(d::KW, arg, letter)
-    if arg in _allGridArgs || isa(arg, Bool)
-        d[Symbol(letter, :grid)] = hasgrid(arg, letter)
-
-    elseif allStyles(arg)
-        d[Symbol(letter, :gridstyle)] = arg
-
-    elseif typeof(arg) <: Stroke
-        arg.width == nothing || (d[Symbol(letter, :gridlinewidth)] = arg.width)
-        arg.color == nothing || (d[Symbol(letter, :foreground_color_grid)] = arg.color in (:auto, :match) ? :match : plot_color(arg.color))
-        arg.alpha == nothing || (d[Symbol(letter, :gridalpha)] = arg.alpha)
-        arg.style == nothing || (d[Symbol(letter, :gridstyle)] = arg.style)
-
-    # linealpha
-    elseif allAlphas(arg)
-        d[Symbol(letter, :gridalpha)] = arg
-
-    # linewidth
-    elseif allReals(arg)
-        d[Symbol(letter, :gridlinewidth)] = arg
-
-    # color
-    elseif !handleColors!(d, arg, Symbol(letter, :foreground_color_grid))
-        warn("Skipped grid arg $arg.")
-
-    end
-end
-
-function processFontArg!(d::KW, fontname::Symbol, arg)
-    T = typeof(arg)
-    if T <: Font
-        d[Symbol(fontname, :family)] = arg.family
-        d[Symbol(fontname, :size)] = arg.pointsize
-        d[Symbol(fontname, :halign)] = arg.halign
-        d[Symbol(fontname, :valign)] = arg.valign
-        d[Symbol(fontname, :rotation)] = arg.rotation
-        d[Symbol(fontname, :color)] = arg.color
-    elseif arg == :center
-        d[Symbol(fontname, :halign)] = :hcenter
-        d[Symbol(fontname, :valign)] = :vcenter
-    elseif arg in (:hcenter, :left, :right)
-        d[Symbol(fontname, :halign)] = arg
-    elseif arg in (:vcenter, :top, :bottom)
-        d[Symbol(fontname, :valign)] = arg
-    elseif T <: Colorant
-        d[Symbol(fontname, :color)] = arg
-    elseif T <: Symbol || T <: AbstractString
-        try
-            d[Symbol(fontname, :color)] = parse(Colorant, string(arg))
-        catch
-            d[Symbol(fontname, :family)] = string(arg)
-        end
-    elseif typeof(arg) <: Integer
-        d[Symbol(fontname, :size)] = arg
-    elseif typeof(arg) <: Real
-        d[Symbol(fontname, :rotation)] = convert(Float64, arg)
-    else
-        warn("Skipped font arg: $arg ($(typeof(arg)))")
-    end
-end
-
 _replace_markershape(shape::Symbol) = get(_markerAliases, shape, shape)
 _replace_markershape(shapes::AVec) = map(_replace_markershape, shapes)
 _replace_markershape(shape) = shape
@@ -822,13 +651,12 @@ function preprocessArgs!(d::KW)
    replaceAliases!(d, _keyAliases)

    # clear all axis stuff
-    # if haskey(d, :axis) && d[:axis] in (:none, nothing, false)
-    #     d[:ticks] = nothing
-    #     d[:foreground_color_border] = RGBA(0,0,0,0)
-    #     d[:foreground_color_axis] = RGBA(0,0,0,0)
-    #     d[:grid] = false
-    #     delete!(d, :axis)
-    # end
+    if haskey(d, :axis) && d[:axis] in (:none, nothing, false)
+        d[:ticks] = nothing
+        d[:foreground_color_border] = RGBA(0,0,0,0)
+        d[:grid] = false
+        delete!(d, :axis)
+    end
    # for letter in (:x, :y, :z)
    #     asym = Symbol(letter, :axis)
    #     if haskey(d, asym) || d[asym] in (:none, nothing, false)
@@ -837,13 +665,6 @@ function preprocessArgs!(d::KW)
    #     end
    # end

-    # handle axis args common to all axis
-    args = pop!(d, :axis, ())
-    for arg in wraptuple(args)
-        for letter in (:x, :y, :z)
-            process_axis_arg!(d, arg, letter)
-        end
-    end
    # handle axis args
    for letter in (:x, :y, :z)
        asym = Symbol(letter, :axis)
@@ -855,48 +676,6 @@ function preprocessArgs!(d::KW)
        end
    end

-    # handle grid args common to all axes
-    args = pop!(d, :grid, ())
-    for arg in wraptuple(args)
-        for letter in (:x, :y, :z)
-            processGridArg!(d, arg, letter)
-        end
-    end
-    # handle individual axes grid args
-    for letter in (:x, :y, :z)
-        gridsym = Symbol(letter, :grid)
-        args = pop!(d, gridsym, ())
-        for arg in wraptuple(args)
-            processGridArg!(d, arg, letter)
-        end
-    end
-
-    # fonts
-    for fontname in (:titlefont, :legendfont)
-        args = pop!(d, fontname, ())
-        for arg in wraptuple(args)
-            processFontArg!(d, fontname, arg)
-        end
-    end
-    # handle font args common to all axes
-    for fontname in (:tickfont, :guidefont)
-        args = pop!(d, fontname, ())
-        for arg in wraptuple(args)
-            for letter in (:x, :y, :z)
-                processFontArg!(d, Symbol(letter, fontname), arg)
-            end
-        end
-    end
-    # handle individual axes font args
-    for letter in (:x, :y, :z)
-        for fontname in (:tickfont, :guidefont)
-            args = pop!(d, Symbol(letter, fontname), ())
-            for arg in wraptuple(args)
-                processFontArg!(d, Symbol(letter, fontname), arg)
-            end
-        end
-    end
-
    # handle line args
    for arg in wraptuple(pop!(d, :line, ()))
        processLineArg(d, arg)
@@ -915,9 +694,6 @@ function preprocessArgs!(d::KW)
    delete!(d, :marker)
    if haskey(d, :markershape)
        d[:markershape] = _replace_markershape(d[:markershape])
-        if d[:markershape] == :none && d[:seriestype] in (:scatter, :scatterbins, :scatterhist, :scatter3d) #the default should be :auto, not :none, so that :none can be set explicitly and would be respected
-            d[:markershape] = :circle
-        end
    elseif anymarker
        d[:markershape_to_add] = :circle  # add it after _apply_recipe
    end
@@ -961,11 +737,6 @@ function preprocessArgs!(d::KW)
        d[:colorbar] = convertLegendValue(d[:colorbar])
    end

-    # framestyle
-    if haskey(d, :framestyle) && haskey(_framestyleAliases, d[:framestyle])
-        d[:framestyle] = _framestyleAliases[d[:framestyle]]
-    end
-
    # warnings for moved recipes
    st = get(d, :seriestype, :path)
    if st in (:boxplot, :violin, :density) && !isdefined(Main, :StatPlots)
@@ -978,36 +749,28 @@ end
 # -----------------------------------------------------------------------------

 "A special type that will break up incoming data into groups, and allow for easier creation of grouped plots"
-mutable struct GroupBy
+type 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)
+function extractGroupArgs(v::AVec, args...)
    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)
+    GroupBy(map(string, groupLabels), groupIds)
 end

-legendEntryFromTuple(ns::Tuple) = string(("$n " for n in ns)...)
-
-# this is when given a tuple of vectors of values to group by
-function extractGroupArgs(vs::Tuple, args...)
-    (vs == ()) && return GroupBy([""], [1:size(args[1],1)])
-    v = collect(zip(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}}
+function extractGroupArgs{T, V<:AVec{Int}}(idxmap::Dict{T,V}, args...)
    groupLabels = sortedkeys(idxmap)
-    groupIds = Vector{Int}[collect(idxmap[k]) for k in groupLabels]
+    groupIds = VecI[collect(idxmap[k]) for k in groupLabels]
    GroupBy(groupLabels, groupIds)
 end

@@ -1088,7 +851,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)
+    elseif val in (:right, :left, :top, :bottom, :inside, :best, :legend, :topright, :topleft, :bottomleft, :bottomright)
        val
    else
        error("Invalid symbol for legend: $val")
@@ -1096,7 +859,7 @@ function convertLegendValue(val::Symbol)
 end
 convertLegendValue(val::Bool) = val ? :best : :none
 convertLegendValue(val::Void) = :none
-convertLegendValue(v::Tuple{S,T}) where {S<:Real, T<:Real} = v
+convertLegendValue{S<:Real, T<:Real}(v::Tuple{S,T}) = v
 convertLegendValue(v::AbstractArray) = map(convertLegendValue, v)

 # -----------------------------------------------------------------------------
@@ -1165,17 +928,12 @@ const _match_map = KW(
    :background_color_legend  => :background_color_subplot,
    :background_color_inside  => :background_color_subplot,
    :foreground_color_legend  => :foreground_color_subplot,
+    :foreground_color_grid    => :foreground_color_subplot,
    :foreground_color_title   => :foreground_color_subplot,
    :left_margin   => :margin,
    :top_margin    => :margin,
    :right_margin  => :margin,
    :bottom_margin => :margin,
-    :titlefontfamily          => :fontfamily_subplot,
-    :legendfontfamily         => :fontfamily_subplot,
-    :titlefontcolor           => :foreground_color_subplot,
-    :legendfontcolor          => :foreground_color_subplot,
-    :tickfontcolor            => :foreground_color_text,
-    :guidefontcolor           => :foreground_color_guide,
 )

 # these can match values from the parent container (axis --> subplot --> plot)
@@ -1184,12 +942,8 @@ const _match_map2 = KW(
    :foreground_color_subplot => :foreground_color,
    :foreground_color_axis    => :foreground_color_subplot,
    :foreground_color_border  => :foreground_color_subplot,
-    :foreground_color_grid    => :foreground_color_subplot,
    :foreground_color_guide   => :foreground_color_subplot,
    :foreground_color_text    => :foreground_color_subplot,
-    :fontfamily_subplot       => :fontfamily,
-    :tickfontfamily           => :fontfamily_subplot,
-    :guidefontfamily          => :fontfamily_subplot,
 )

 # properly retrieve from plt.attr, passing `:match` to the correct key
@@ -1322,6 +1076,7 @@ function _update_subplot_colors(sp::Subplot)
    # foreground colors
    color_or_nothing!(sp.attr, :foreground_color_subplot)
    color_or_nothing!(sp.attr, :foreground_color_legend)
+    color_or_nothing!(sp.attr, :foreground_color_grid)
    color_or_nothing!(sp.attr, :foreground_color_title)
    return
 end
@@ -1373,7 +1128,6 @@ function _update_axis_colors(axis::Axis)
    color_or_nothing!(axis.d, :foreground_color_border)
    color_or_nothing!(axis.d, :foreground_color_guide)
    color_or_nothing!(axis.d, :foreground_color_text)
-    color_or_nothing!(axis.d, :foreground_color_grid)
    return
 end

@@ -1410,8 +1164,6 @@ end

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

-has_black_border_for_default(st) = error("The seriestype attribute only accepts Symbols, you passed the $(typeof(st)) $st.")
-has_black_border_for_default(st::Function) = error("The seriestype attribute only accepts Symbols, you passed the function $st.")
 function has_black_border_for_default(st::Symbol)
    like_histogram(st) || st in (:hexbin, :bar, :shape)
 end
@@ -1481,14 +1233,12 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
    # update other colors
    for s in (:line, :marker, :fill)
        csym, asym = Symbol(s,:color), Symbol(s,:alpha)
-        d[csym] = if d[csym] == :auto
+        d[csym] = if d[csym] == :match
            plot_color(if has_black_border_for_default(d[:seriestype]) && s == :line
                sp[:foreground_color_subplot]
            else
                d[:seriescolor]
            end, d[asym])
-        elseif d[csym] == :match
-            plot_color(d[:seriescolor], d[asym])
        else
            getSeriesRGBColor(d[csym], d[asym], sp, plotIndex)
        end
@@ -1501,19 +1251,16 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
        getSeriesRGBColor(d[:markerstrokecolor], d[:markerstrokealpha], sp, plotIndex)
    end

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

    # scatter plots don't have a line, but must have a shape
-    if d[:seriestype] in (:scatter, :scatterbins, :scatterhist, :scatter3d)
+    if d[:seriestype] in (:scatter, :scatter3d)
        d[:linewidth] = 0
        if d[:markershape] == :none
            d[:markershape] = :circle
@@ -70,16 +70,13 @@ function process_axis_arg!(d::KW, arg, letter = "")
    elseif arg == nothing
        d[Symbol(letter,:ticks)] = []

-    elseif T <: Bool || arg in _allShowaxisArgs
-        d[Symbol(letter,:showaxis)] = showaxis(arg, letter)
-
    elseif typeof(arg) <: Number
        d[Symbol(letter,:rotation)] = arg

    elseif typeof(arg) <: Function
        d[Symbol(letter,:formatter)] = arg

-    elseif !handleColors!(d, arg, Symbol(letter, :foreground_color_axis))
+    else
        warn("Skipped $(letter)axis arg $arg")

    end
@@ -121,7 +118,7 @@ Base.show(io::IO, axis::Axis) = dumpdict(axis.d, "Axis", true)
 # Base.getindex(axis::Axis, k::Symbol) = getindex(axis.d, k)
 Base.setindex!(axis::Axis, v, ks::Symbol...) = setindex!(axis.d, v, ks...)
 Base.haskey(axis::Axis, k::Symbol) = haskey(axis.d, k)
-ignorenan_extrema(axis::Axis) = (ex = axis[:extrema]; (ex.emin, ex.emax))
+Base.extrema(axis::Axis) = (ex = axis[:extrema]; (ex.emin, ex.emax))


 const _scale_funcs = Dict{Symbol,Function}(
@@ -159,52 +156,16 @@ function optimal_ticks_and_labels(axis::Axis, ticks = nothing)
    scale = axis[: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
-    # This bypasses the rest of optimal_ticks_and_labels, because
-    # optimize_datetime_ticks returns ticks AND labels: the label format (Date
-    # 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] == 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,
-            # are converted to 'DateTime integers' (actually floats) before
-            # being passed to optimize_datetime_ticks.
-            # (convert(Int, convert(DateTime, convert(Date, i))) == 87600000*i)
-            ticks, labels = optimize_datetime_ticks(864e5 * amin, 864e5 * amax;
-                k_min = 2, k_max = 4)
-            # Now the ticks are converted back to floats corresponding to Dates.
-            return ticks / 864e5, labels
-        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
-        scaled_ticks = optimize_ticks(
+    scaled_ticks = if ticks == nothing
+        optimize_ticks(
            sf(amin),
            sf(amax);
-            k_min = 4, # minimum number of ticks
+            k_min = 5, # minimum number of ticks
            k_max = 8, # maximum number of ticks
        )[1]
-    elseif typeof(ticks) <: Int
-        scaled_ticks, viewmin, viewmax = optimize_ticks(
-            sf(amin),
-            sf(amax);
-            k_min = ticks, # minimum number of ticks
-            k_max = ticks, # maximum number of ticks
-            k_ideal = ticks,
-            # `strict_span = false` rewards cases where the span of the
-            # chosen  ticks is not too much bigger than amin - amax:
-            strict_span = false,
-        )
-        axis[:lims] = map(invscalefunc(scale), (viewmin, viewmax))
    else
-        scaled_ticks = map(sf, (filter(t -> amin <= t <= amax, ticks)))
+        map(sf, filter(t -> amin <= t <= amax, ticks))
    end
    unscaled_ticks = map(invscalefunc(scale), scaled_ticks)

@@ -231,7 +192,7 @@ end

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

    dvals = axis[:discrete_values]
@@ -239,17 +200,12 @@ function get_ticks(axis::Axis)
        # discrete ticks...
        axis[:continuous_values], dvals
    elseif ticks == :auto
-        if ispolar(axis.sps[1]) && axis[:letter] == :x
-            #force theta axis to be full circle
-            (collect(0:pi/4:7pi/4), string.(0:45:315))
-        else
-            # compute optimal ticks and labels
-            optimal_ticks_and_labels(axis)
-        end
-    elseif typeof(ticks) <: Union{AVec, Int}
+        # compute optimal ticks and labels
+        optimal_ticks_and_labels(axis)
+    elseif typeof(ticks) <: AVec
        # override ticks, but get the labels
        optimal_ticks_and_labels(axis, ticks)
-    elseif typeof(ticks) <: NTuple{2, Any}
+    elseif typeof(ticks) <: NTuple{2}
        # assuming we're passed (ticks, labels)
        ticks
    else
@@ -258,7 +214,7 @@ function get_ticks(axis::Axis)
    # @show ticks dvals cv dv

    # TODO: better/smarter cutoff values for sampling ticks
-    if length(cv) > 30 && ticks == :auto
+    if length(cv) > 30
        rng = Int[round(Int,i) for i in linspace(1, length(cv), 15)]
        cv[rng], dv[rng]
    else
@@ -266,10 +222,6 @@ function get_ticks(axis::Axis)
    end
 end

-_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])
-
 # -------------------------------------------------------------------------


@@ -284,8 +236,8 @@ end


 function expand_extrema!(ex::Extrema, v::Number)
-    ex.emin = NaNMath.min(v, ex.emin)
-    ex.emax = NaNMath.max(v, ex.emax)
+    ex.emin = min(v, ex.emin)
+    ex.emax = max(v, ex.emax)
    ex
 end

@@ -298,13 +250,13 @@ expand_extrema!(axis::Axis, ::Void) = axis[:extrema]
 expand_extrema!(axis::Axis, ::Bool) = axis[:extrema]


-function expand_extrema!(axis::Axis, v::Tuple{MIN,MAX}) where {MIN<:Number,MAX<:Number}
+function expand_extrema!{MIN<:Number,MAX<:Number}(axis::Axis, v::Tuple{MIN,MAX})
    ex = axis[:extrema]
-    ex.emin = NaNMath.min(v[1], ex.emin)
-    ex.emax = NaNMath.max(v[2], ex.emax)
+    ex.emin = min(v[1], ex.emin)
+    ex.emax = max(v[2], ex.emax)
    ex
 end
-function expand_extrema!(axis::Axis, v::AVec{N}) where N<:Number
+function expand_extrema!{N<:Number}(axis::Axis, v::AVec{N})
    ex = axis[:extrema]
    for vi in v
        expand_extrema!(ex, vi)
@@ -355,7 +307,7 @@ function expand_extrema!(sp::Subplot, d::KW)
    if fr == nothing && d[:seriestype] == :bar
        fr = 0.0
    end
-    if fr != nothing && !all3D(d)
+    if fr != nothing
        axis = sp.attr[vert ? :yaxis : :xaxis]
        if typeof(fr) <: Tuple
            for fri in fr
@@ -373,22 +325,13 @@ function expand_extrema!(sp::Subplot, d::KW)

        bw = d[:bar_width]
        if bw == nothing
-            bw = d[:bar_width] = _bar_width * ignorenan_minimum(filter(x->x>0,diff(sort(data))))
+            bw = d[:bar_width] = mean(diff(data))
        end
        axis = sp.attr[Symbol(dsym, :axis)]
-        expand_extrema!(axis, ignorenan_maximum(data) + 0.5maximum(bw))
-        expand_extrema!(axis, ignorenan_minimum(data) - 0.5minimum(bw))
+        expand_extrema!(axis, maximum(data) + 0.5maximum(bw))
+        expand_extrema!(axis, minimum(data) - 0.5minimum(bw))
    end

-    # expand for heatmaps
-    if d[:seriestype] == :heatmap
-        for letter in (:x, :y)
-            data = d[letter]
-            axis = sp[Symbol(letter, "axis")]
-            scale = get(d, Symbol(letter, "scale"), :identity)
-            expand_extrema!(axis, heatmap_edges(data, scale))
-        end
-    end
 end

 function expand_extrema!(sp::Subplot, xmin, xmax, ymin, ymax)
@@ -401,8 +344,8 @@ end
 # push the limits out slightly
 function widen(lmin, lmax)
    span = lmax - lmin
-    # eps = NaNMath.max(1e-16, min(1e-2span, 1e-10))
-    eps = NaNMath.max(1e-16, 0.03span)
+    # eps = max(1e-16, min(1e-2span, 1e-10))
+    eps = max(1e-16, 0.03span)
    lmin-eps, lmax+eps
 end

@@ -441,16 +384,7 @@ function axis_limits(axis::Axis, should_widen::Bool = default_should_widen(axis)
    if !isfinite(amin) && !isfinite(amax)
        amin, amax = 0.0, 1.0
    end
-    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
-            amin, amax + 0.1 * abs(amax - amin)
-        else
-            amin, amax
-        end
-    elseif should_widen
+    if should_widen
        widen(amin, amax)
    else
        amin, amax
@@ -467,7 +401,7 @@ function discrete_value!(axis::Axis, dv)
    # @show axis[:discrete_map], axis[:discrete_values], dv
    if cv_idx == -1
        ex = axis[:extrema]
-        cv = NaNMath.max(0.5, ex.emax + 1.0)
+        cv = max(0.5, ex.emax + 1.0)
        expand_extrema!(axis, cv)
        push!(axis[:discrete_values], dv)
        push!(axis[:continuous_values], cv)
@@ -532,94 +466,38 @@ function axis_drawing_info(sp::Subplot)
    ymin, ymax = axis_limits(yaxis)
    xticks = get_ticks(xaxis)
    yticks = get_ticks(yaxis)
-    xaxis_segs = Segments(2)
-    yaxis_segs = Segments(2)
-    xtick_segs = Segments(2)
-    ytick_segs = Segments(2)
-    xgrid_segs = Segments(2)
-    ygrid_segs = Segments(2)
-    xborder_segs = Segments(2)
-    yborder_segs = Segments(2)
+    spine_segs = Segments(2)
+    grid_segs = Segments(2)

-    if sp[:framestyle] != :none
-        # xaxis
-        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 && 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 (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)
+    if !(xaxis[:ticks] in (nothing, false))
+        f = scalefunc(yaxis[:scale])
+        invf = invscalefunc(yaxis[:scale])
+        t1 = invf(f(ymin) + 0.015*(f(ymax)-f(ymin)))
+        t2 = invf(f(ymax) - 0.015*(f(ymax)-f(ymin)))

-            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
-
-        # yaxis
-        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 && 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 (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
+        push!(spine_segs, (xmin,ymin), (xmax,ymin)) # bottom spine
+        # push!(spine_segs, (xmin,ymax), (xmax,ymax)) # top spine
+        for xtick in xticks[1]
+            push!(spine_segs, (xtick, ymin), (xtick, t1)) # bottom tick
+            push!(grid_segs,  (xtick, t1),   (xtick, t2)) # vertical grid
+            # push!(spine_segs, (xtick, ymax), (xtick, t2)) # top tick
        end
    end

-    xticks, yticks, xaxis_segs, yaxis_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xborder_segs, yborder_segs
+    if !(yaxis[:ticks] in (nothing, false))
+        f = scalefunc(xaxis[:scale])
+        invf = invscalefunc(xaxis[:scale])
+        t1 = invf(f(xmin) + 0.015*(f(xmax)-f(xmin)))
+        t2 = invf(f(xmax) - 0.015*(f(xmax)-f(xmin)))
+
+        push!(spine_segs, (xmin,ymin), (xmin,ymax)) # left spine
+        # push!(spine_segs, (xmax,ymin), (xmax,ymax)) # right spine
+        for ytick in yticks[1]
+            push!(spine_segs, (xmin, ytick), (t1, ytick)) # left tick
+            push!(grid_segs,  (t1, ytick),   (t2, ytick)) # horizontal grid
+            # push!(spine_segs, (xmax, ytick), (t2, ytick)) # right tick
+        end
+    end
+
+    xticks, yticks, spine_segs, grid_segs
 end
@@ -1,15 +1,12 @@

-struct NoBackend <: AbstractBackend end
+immutable NoBackend <: AbstractBackend end

 const _backendType = Dict{Symbol, DataType}(:none => NoBackend)
 const _backendSymbol = Dict{DataType, Symbol}(NoBackend => :none)
 const _backends = Symbol[]
 const _initialized_backends = Set{Symbol}()

-"Returns a list of supported backends"
 backends() = _backends
-
-"Returns the name of the current backend"
 backend_name() = CURRENT_BACKEND.sym
 _backend_instance(sym::Symbol) = haskey(_backendType, sym) ? _backendType[sym]() : error("Unsupported backend $sym")

@@ -18,14 +15,15 @@ macro init_backend(s)
    sym = Symbol(str)
    T = Symbol(string(s) * "Backend")
    esc(quote
-        struct $T <: AbstractBackend end
+        immutable $T <: AbstractBackend end
        export $sym
        $sym(; kw...) = (default(; kw...); backend(Symbol($str)))
        backend_name(::$T) = Symbol($str)
+        backend_package_name(::$T) = Symbol("Plots", $(string(s)))
        push!(_backends, Symbol($str))
        _backendType[Symbol($str)] = $T
        _backendSymbol[$T] = Symbol($str)
-        include("backends/" * $str * ".jl")
+        # include("backends/" * $str * ".jl")
    end)
 end

@@ -51,8 +49,8 @@ _series_updated(plt::Plot, series::Series) = nothing

 _before_layout_calcs(plt::Plot) = nothing

-title_padding(sp::Subplot) = sp[:title] == "" ? 0mm : sp[:titlefontsize] * pt
-guide_padding(axis::Axis) = axis[:guide] == "" ? 0mm : axis[:guidefontsize] * pt
+title_padding(sp::Subplot) = sp[:title] == "" ? 0mm : sp[:titlefont].pointsize * pt
+guide_padding(axis::Axis) = axis[:guide] == "" ? 0mm : axis[:guidefont].pointsize * pt

 "Returns the (width,height) of a text label."
 function text_size(lablen::Int, sz::Number, rot::Number = 0)
@@ -93,7 +91,7 @@ function tick_padding(axis::Axis)
        # hgt

        # get the height of the rotated label
-        text_size(longest_label, axis[:tickfontsize], rot)[2]
+        text_size(longest_label, axis[:tickfont].pointsize, rot)[2]
    end
 end

@@ -123,7 +121,7 @@ _update_plot_object(plt::Plot) = nothing
 # ---------------------------------------------------------


-mutable struct CurrentBackend
+type CurrentBackend
  sym::Symbol
  pkg::AbstractBackend
 end
@@ -151,7 +149,7 @@ function pickDefaultBackend()
    # the ordering/inclusion of this package list is my semi-arbitrary guess at
    # which one someone will want to use if they have the package installed...accounting for
    # features, speed, and robustness
-    for pkgstr in ("GR", "PyPlot", "PlotlyJS", "PGFPlots", "UnicodePlots", "InspectDR", "GLVisualize")
+    for pkgstr in ("GR", "PlotlyJS", "PyPlot", "UnicodePlots")
        if Pkg.installed(pkgstr) != nothing
            return backend(Symbol(lowercase(pkgstr)))
        end
@@ -266,24 +264,32 @@ function merge_with_base_supported(v::AVec)
 end


-
-# @init_backend Immerse
-# @init_backend Gadfly
-@init_backend PyPlot
-# @init_backend Qwt
-@init_backend UnicodePlots
-# @init_backend Winston
-# @init_backend Bokeh
+# @init_backend PyPlot
+# @init_backend UnicodePlots
@init_backend Plotly
-@init_backend PlotlyJS
+# @init_backend PlotlyJS
@init_backend GR
-@init_backend GLVisualize
-@init_backend PGFPlots
-@init_backend InspectDR
-@init_backend HDF5
+# @init_backend GLVisualize
+# @init_backend PGFPlots
+# @init_backend InspectDR
+
+_initialize_backend(::PlotlyBackend) = include("backends/plotly.jl")
+
+function _initialize_backend(b::AbstractBackend)
+    bname = backend_name(b)
+    @eval import $(backend_package_name(b))
+end

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

+const _attr = KW()
+const _seriestype = KW()
+const _marker = KW()
+const _style = KW()
+const _scale = KW()
+
+using Base.Meta
+
 # create the various `is_xxx_supported` and `supported_xxxs` methods
 # by default they pass through to checking membership in `_gr_xxx`
 for s in (:attr, :seriestype, :marker, :style, :scale)
@@ -298,13 +304,38 @@ for s in (:attr, :seriestype, :marker, :style, :scale)

    for bend in backends()
        bend_type = typeof(_backend_instance(bend))
-        v = Symbol("_", bend, "_", s)
+        # v = Symbol("_", bend, "_", s)
+        v = Symbol("_", s)
        @eval begin
-            $f(::$bend_type, $s::Symbol) = $s in $v
-            $f2(::$bend_type) = $v
+            $f(::$bend_type, $s::Symbol) = $s in $v[$(quot(bend))]
+            $f2(::$bend_type) = $v[$(quot(bend))]
        end
    end
 end

-# is_subplot_supported(::AbstractBackend) = false
-# is_subplot_supported() = is_subplot_supported(backend())
+# ---------------------------------------------------------
+
+# # create the various `is_xxx_supported` and `supported_xxxs` methods
+# # by default they pass through to checking membership in `_gr_xxx`
+# for s in (:attr, :seriestype, :marker, :style, :scale)
+#     f = Symbol("is_", s, "_supported")
+#     f2 = Symbol("supported_", s, "s")
+#     @eval begin
+#         $f(::AbstractBackend, $s) = false
+#         $f(bend::AbstractBackend, $s::AbstractVector) = all(v -> $f(bend, v), $s)
+#         $f($s) = $f(backend(), $s)
+#         $f2() = $f2(backend())
+#     end
+#
+#     for bend in backends()
+#         bend_type = typeof(_backend_instance(bend))
+#         v = Symbol("_", bend, "_", s)
+#         @eval begin
+#             $f(::$bend_type, $s::Symbol) = $s in $v
+#             $f2(::$bend_type) = $v
+#         end
+#     end
+# end
+#
+# # is_subplot_supported(::AbstractBackend) = false
+# # is_subplot_supported() = is_subplot_supported(backend())
@@ -1,4 +1,4 @@
-#=
+``#=
 TODO
    * move all gl_ methods to GLPlot
    * integrate GLPlot UI
@@ -7,12 +7,9 @@ TODO
    * polar plots
    * labes and axis
    * fix units in all visuals (e.g dotted lines, marker scale, surfaces)
+    * why is there so little unicode supported in the font!??!?
 =#

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "glvisualize.jl"))
-end
-
 const _glvisualize_attr = merge_with_base_supported([
    :annotations,
    :background_color_legend, :background_color_inside, :background_color_outside,
@@ -24,15 +21,11 @@ const _glvisualize_attr = merge_with_base_supported([
    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
    :fillrange, :fillcolor, :fillalpha,
    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location,
+    :title, :title_location, :titlefont,
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
-    :titlefontsize, :titlefontcolor,
-    :legendfontsize, :legendfontcolor,
-    :tickfontsize,
-    :guidefontsize, :guidefontcolor,
-    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :colorbar,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend, :colorbar,
    :marker_z,
    :line_z,
    :levels,
@@ -46,9 +39,7 @@ const _glvisualize_attr = merge_with_base_supported([
    :clims,
    :inset_subplots,
    :dpi,
-    :hover,
-    :framestyle,
-    :tick_direction,
+    :hover
 ])
 const _glvisualize_seriestype = [
    :path, :shape,
@@ -68,7 +59,7 @@ const _glvisualize_scale = [:identity, :ln, :log2, :log10]
 function _initialize_backend(::GLVisualizeBackend; kw...)
    @eval begin
        import GLVisualize, GeometryTypes, Reactive, GLAbstraction, GLWindow, Contour
-        import GeometryTypes: Point2f0, Point3f0, Vec2f0, Vec3f0, GLNormalMesh, SimpleRectangle, Point, Vec
+        import GeometryTypes: Point2f0, Point3f0, Vec2f0, Vec3f0, GLNormalMesh, SimpleRectangle
        import FileIO, Images
        export GLVisualize
        import Reactive: Signal
@@ -76,9 +67,10 @@ function _initialize_backend(::GLVisualizeBackend; kw...)
        import GLVisualize: visualize
        import Plots.GL
        import UnicodeFun
-        Plots.slice_arg(img::Matrix{C}, idx::Int) where {C<:Colorant} = img
+        Plots.slice_arg(img::Images.AbstractImage, idx::Int) = img
        is_marker_supported(::GLVisualizeBackend, shape::GLVisualize.AllPrimitives) = true
-        is_marker_supported(::GLVisualizeBackend, shape::Union{Vector{Matrix{C}}, Matrix{C}}) where {C<:Colorant} = true
+        is_marker_supported{Img<:Images.AbstractImage}(::GLVisualizeBackend, shape::Union{Vector{Img}, Img}) = true
+        is_marker_supported{C<:Colorant}(::GLVisualizeBackend, shape::Union{Vector{Matrix{C}}, Matrix{C}}) = true
        is_marker_supported(::GLVisualizeBackend, shape::Shape) = true
        const GL = Plots
    end
@@ -86,9 +78,14 @@ end

 function add_backend_string(b::GLVisualizeBackend)
    """
-    if !Plots.is_installed("GLVisualize")
-        Pkg.add("GLVisualize")
-    end
+    For those incredibly brave souls who assume full responsibility for what happens next...
+    There's an easy way to get what you need for the GLVisualize backend to work (until Pkg3 is usable):
+
+    Pkg.clone("https://github.com/tbreloff/MetaPkg.jl")
+    using MetaPkg
+    meta_checkout("MetaGL")
+
+    See the MetaPkg readme for details...
    """
 end

@@ -102,6 +99,46 @@ end
 # end
 const _glplot_deletes = []

+function close_child_signals!(screen)
+    for child in screen.children
+        for (k, s) in child.inputs
+            empty!(s.actions)
+        end
+        for (k, cam) in child.cameras
+            for f in fieldnames(cam)
+                s = getfield(cam, f)
+                if isa(s, Signal)
+                    close(s, false)
+                end
+            end
+        end
+        empty!(child.cameras)
+        close_child_signals!(child)
+    end
+    return
+end
+function empty_screen!(screen)
+    if isempty(_glplot_deletes)
+        close_child_signals!(screen)
+        empty!(screen)
+        empty!(screen.cameras)
+        for (k, s) in screen.inputs
+            empty!(s.actions)
+        end
+        empty!(screen)
+    else
+        for del_signal in _glplot_deletes
+            push!(del_signal, true) # trigger delete
+        end
+        empty!(_glplot_deletes)
+    end
+    nothing
+end
+function poll_reactive()
+    # run_till_now blocks when message queue is empty!
+    Base.n_avail(Reactive._messages) > 0 && Reactive.run_till_now()
+end
+

 function get_plot_screen(list::Vector, name, result = [])
    for elem in list
@@ -118,36 +155,38 @@ function get_plot_screen(screen, name, result = [])
 end

 function create_window(plt::Plot{GLVisualizeBackend}, visible)
-    name = Symbol("__Plots.jl")
+    name = Symbol("Plots.jl")
    # make sure we have any screen open
    if isempty(GLVisualize.get_screens())
        # create a fresh, new screen
        parent_screen = GLVisualize.glscreen(
-            "Plots",
+            "Plot",
            resolution = plt[:size],
            visible = visible
        )
-        @async GLWindow.renderloop(parent_screen)
-        GLVisualize.add_screen(parent_screen)
+        @async GLWindow.waiting_renderloop(parent_screen)
    end
    # now lets get ourselves a permanent Plotting screen
-    plot_screens = get_plot_screen(GLVisualize.current_screen(), name)
+    plot_screens = get_plot_screen(GLVisualize.get_screens(), name)
    screen = if isempty(plot_screens) # no screen with `name`
        parent = GLVisualize.current_screen()
        screen = GLWindow.Screen(
            parent, area = map(GLWindow.zeroposition, parent.area),
            name = name
        )
+        for (k, s) in screen.inputs # copy signals, so we can clean them up better
+            screen.inputs[k] = map(identity, s)
+        end
        screen
    elseif length(plot_screens) == 1
        plot_screens[1]
    else
        # okay this is silly! Lets see if we can. There is an ID we could use
        # will not be fine for more than 255 screens though -.-.
-        error("multiple Plot screens. Please don't use any screen with the name $name")
+        error("multiple Plot screens. Please don't use any screen with the name Plots.jl")
    end
    # Since we own this window, we can do deep cleansing
-    empty!(screen)
+    empty_screen!(screen)
    plt.o = screen
    GLWindow.set_visibility!(screen, visible)
    resize!(screen, plt[:size]...)
@@ -182,12 +221,12 @@ function gl_marker(shape)
    shape
 end
 function gl_marker(shape::Shape)
-    points = Point2f0[GeometryTypes.Vec{2, Float32}(p) for p in zip(shape.x, shape.y)]
+    points = Point2f0[Vec{2,Float32}(p) for p in zip(shape.x, shape.y)]
    bb = GeometryTypes.AABB(points)
    mini, maxi = minimum(bb), maximum(bb)
    w3 = maxi-mini
    origin, width = Point2f0(mini[1], mini[2]), Point2f0(w3[1], w3[2])
-    map!(p -> ((p - origin) ./ width) - 0.5f0, points, points) # normalize and center
+    map!(p -> ((p - origin) ./ width) - 0.5f0, points) # normalize and center
    GeometryTypes.GLNormalMesh(points)
 end
 # create a marker/shape type
@@ -221,13 +260,13 @@ function extract_limits(sp, d, kw_args)
    nothing
 end

-to_vec(::Type{T}, vec::T) where {T <: StaticArrays.StaticVector} = vec
-to_vec(::Type{T}, s::Number) where {T <: StaticArrays.StaticVector} = T(s)
+to_vec{T <: FixedVector}(::Type{T}, vec::T) = vec
+to_vec{T <: FixedVector}(::Type{T}, s::Number) = T(s)

-to_vec(::Type{T}, vec::StaticArrays.StaticVector{3}) where {T <: StaticArrays.StaticVector{2}} = T(vec[1], vec[2])
-to_vec(::Type{T}, vec::StaticArrays.StaticVector{2}) where {T <: StaticArrays.StaticVector{3}} = T(vec[1], vec[2], 0)
+to_vec{T <: FixedVector{2}}(::Type{T}, vec::FixedVector{3}) = T(vec[1], vec[2])
+to_vec{T <: FixedVector{3}}(::Type{T}, vec::FixedVector{2}) = T(vec[1], vec[2], 0)

-to_vec(::Type{T}, vecs::AbstractVector) where {T <: StaticArrays.StaticVector} = map(x-> to_vec(T, x), vecs)
+to_vec{T <: FixedVector}(::Type{T}, vecs::AbstractVector) = map(x-> to_vec(T, x), vecs)

 function extract_marker(d, kw_args)
    dim = Plots.is3d(d) ? 3 : 2
@@ -282,15 +321,15 @@ end
 function extract_surface(d)
    map(_extract_surface, (d[:x], d[:y], d[:z]))
 end
-function topoints(::Type{P}, array) where P
-    [P(x) for x in zip(array...)]
+function topoints{P}(::Type{P}, array)
+    P[x for x in zip(array...)]
 end
 function extract_points(d)
    dim = is3d(d) ? 3 : 2
    array = (d[:x], d[:y], d[:z])[1:dim]
    topoints(Point{dim, Float32}, array)
 end
-function make_gradient(grad::Vector{C}) where C <: Colorant
+function make_gradient{C <: Colorant}(grad::Vector{C})
    grad
 end
 function make_gradient(grad::ColorGradient)
@@ -313,7 +352,7 @@ function extract_any_color(d, kw_args)
                    kw_args[:color_norm] = Vec2f0(clims)
                end
            elseif clims == :auto
-                kw_args[:color_norm] = Vec2f0(ignorenan_extrema(d[:y]))
+                kw_args[:color_norm] = Vec2f0(extrema(d[:y]))
            end
        end
    else
@@ -324,7 +363,7 @@ function extract_any_color(d, kw_args)
                kw_args[:color_norm] = Vec2f0(clims)
            end
        elseif clims == :auto
-            kw_args[:color_norm] = Vec2f0(ignorenan_extrema(d[:y]))
+            kw_args[:color_norm] = Vec2f0(extrema(d[:y]))
        else
            error("Unsupported limits: $clims")
        end
@@ -345,7 +384,7 @@ function extract_color(d, sym)
 end

 gl_color(c::PlotUtils.ColorGradient) = c.colors
-gl_color(c::Vector{T}) where {T<:Colorant} = c
+gl_color{T<:Colorant}(c::Vector{T}) = c
 gl_color(c::RGBA{Float32}) = c
 gl_color(c::Colorant) = RGBA{Float32}(c)

@@ -376,14 +415,14 @@ end


 dist(a, b) = abs(a-b)
-mindist(x, a, b) = NaNMath.min(dist(a, x), dist(b, x))
+mindist(x, a, b) = min(dist(a, x), dist(b, x))

 function gappy(x, ps)
    n = length(ps)
    x <= first(ps) && return first(ps) - x
    for j=1:(n-1)
        p0 = ps[j]
-        p1 = ps[NaNMath.min(j+1, n)]
+        p1 = ps[min(j+1, n)]
        if p0 <= x && p1 >= x
            return mindist(x, p0, p1) * (isodd(j) ? 1 : -1)
        end
@@ -491,7 +530,7 @@ function hover(to_hover, to_display, window)
 end

 function extract_extrema(d, kw_args)
-    xmin, xmax = ignorenan_extrema(d[:x]); ymin, ymax = ignorenan_extrema(d[:y])
+    xmin, xmax = extrema(d[:x]); ymin, ymax = extrema(d[:y])
    kw_args[:primitive] = GeometryTypes.SimpleRectangle{Float32}(xmin, ymin, xmax-xmin, ymax-ymin)
    nothing
 end
@@ -518,7 +557,7 @@ function extract_colornorm(d, kw_args)
        else
            d[:y]
        end
-        kw_args[:color_norm] = Vec2f0(ignorenan_extrema(z))
+        kw_args[:color_norm] = Vec2f0(extrema(z))
        kw_args[:intensity] = map(Float32, collect(z))
    end
 end
@@ -585,10 +624,8 @@ end

 function align_offset(startpos, lastpos, atlas, rscale, font, align)
    xscale, yscale = GLVisualize.glyph_scale!('X', rscale)
-    xmove = (lastpos-startpos)[1] + xscale
-    if isa(align, GeometryTypes.Vec)
-        return -Vec2f0(xmove, yscale) .* align
-    elseif align == :top
+    xmove = (lastpos-startpos)[1]+xscale
+    if align == :top
        return -Vec2f0(xmove/2f0, yscale)
    elseif align == :right
        return -Vec2f0(xmove, yscale/2f0)
@@ -597,6 +634,11 @@ function align_offset(startpos, lastpos, atlas, rscale, font, align)
    end
 end

+function align_offset(startpos, lastpos, atlas, rscale, font, align::Vec)
+    xscale, yscale = GLVisualize.glyph_scale!('X', rscale)
+    xmove = (lastpos-startpos)[1] + xscale
+    return -Vec2f0(xmove, yscale) .* align
+end

 function alignment2num(x::Symbol)
    (x in (:hcenter, :vcenter)) && return 0.5
@@ -612,10 +654,10 @@ end
 pointsize(font) = font.pointsize * 2

 function draw_ticks(
-        axis, ticks, isx, isorigin, lims, m, text = "",
+        axis, ticks, isx, lims, m, text = "",
        positions = Point2f0[], offsets=Vec2f0[]
    )
-    sz = pointsize(tickfont(axis))
+    sz = pointsize(axis[:tickfont])
    atlas = GLVisualize.get_texture_atlas()
    font = GLVisualize.defaultfont()

@@ -630,11 +672,7 @@ function draw_ticks(
    for (cv, dv) in zip(ticks...)

        x, y = cv, lims[1]
-        xy = if isorigin
-            isx ? (x, 0) : (0, x)
-        else
-            isx ? (x, y) : (y, x)
-        end
+        xy = isx ? (x, y) : (y, x)
        _pos = m * GeometryTypes.Vec4f0(xy[1], xy[2], 0, 1)
        startpos = Point2f0(_pos[1], _pos[2]) - axis_gap
        str = string(dv)
@@ -648,7 +686,7 @@ function draw_ticks(
        position = GLVisualize.calc_position(str, startpos, sz, font, atlas)
        offset = GLVisualize.calc_offset(str, sz, font, atlas)
        alignoff = align_offset(startpos, last(position), atlas, sz, font, align)
-        map!(position, position) do pos
+        map!(position) do pos
            pos .+ alignoff
        end
        append!(positions, position)
@@ -659,7 +697,7 @@ function draw_ticks(
    text, positions, offsets
 end

-function glvisualize_text(position, text, kw_args)
+function text(position, text, kw_args)
    text_align = alignment2num(text.font)
    startpos = Vec2f0(position)
    atlas = GLVisualize.get_texture_atlas()
@@ -670,7 +708,7 @@ function glvisualize_text(position, text, kw_args)
    offset = GLVisualize.calc_offset(text.str, rscale, font, atlas)
    alignoff = align_offset(startpos, last(position), atlas, rscale, font, text_align)

-    map!(position, position) do pos
+    map!(position) do pos
        pos .+ alignoff
    end
    kw_args[:position] = position
@@ -690,122 +728,72 @@ function text_model(font, pivot)
    end
 end
 function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, area)
-    xticks, yticks, xspine_segs, yspine_segs, xtick_segs, ytick_segs, xgrid_segs, ygrid_segs, xborder_segs, yborder_segs = Plots.axis_drawing_info(sp)
+    xticks, yticks, spine_segs, grid_segs = Plots.axis_drawing_info(sp)
    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]

-    xgc = Colors.color(Plots.gl_color(xaxis[:foreground_color_grid]))
-    ygc = Colors.color(Plots.gl_color(yaxis[:foreground_color_grid]))
+    c = Colors.color(Plots.gl_color(sp[:foreground_color_grid]))
    axis_vis = []
-    if xaxis[:grid]
-        grid = draw_grid_lines(sp, xgrid_segs, xaxis[:gridlinewidth], xaxis[:gridstyle], model, RGBA(xgc, xaxis[:gridalpha]))
+    if sp[:grid]
+        grid = draw_grid_lines(sp, grid_segs, 1f0, :dot, model, RGBA(c, 0.3f0))
        push!(axis_vis, grid)
    end
-    if yaxis[:grid]
-        grid = draw_grid_lines(sp, ygrid_segs, yaxis[:gridlinewidth], yaxis[:gridstyle], model, RGBA(ygc, yaxis[:gridalpha]))
-        push!(axis_vis, grid)
-    end
-
-    xac = Colors.color(Plots.gl_color(xaxis[:foreground_color_axis]))
-    yac = Colors.color(Plots.gl_color(yaxis[:foreground_color_axis]))
-    if alpha(xaxis[:foreground_color_axis]) > 0
-        spine = draw_grid_lines(sp, xspine_segs, 1f0, :solid, model, RGBA(xac, 1.0f0))
+    if alpha(xaxis[:foreground_color_border]) > 0
+        spine = draw_grid_lines(sp, spine_segs, 1f0, :solid, model, RGBA(c, 1.0f0))
        push!(axis_vis, spine)
    end
-    if alpha(yaxis[:foreground_color_axis]) > 0
-        spine = draw_grid_lines(sp, yspine_segs, 1f0, :solid, model, RGBA(yac, 1.0f0))
-        push!(axis_vis, spine)
-    end
-    if sp[:framestyle] in (:zerolines, :grid)
-        if alpha(xaxis[:foreground_color_grid]) > 0
-            spine = draw_grid_lines(sp, xtick_segs, 1f0, :solid, model, RGBA(xgc, xaxis[:gridalpha]))
-            push!(axis_vis, spine)
-        end
-        if alpha(yaxis[:foreground_color_grid]) > 0
-            spine = draw_grid_lines(sp, ytick_segs, 1f0, :solid, model, RGBA(ygc, yaxis[:gridalpha]))
-            push!(axis_vis, spine)
-        end
-    else
-        if alpha(xaxis[:foreground_color_axis]) > 0
-            spine = draw_grid_lines(sp, xtick_segs, 1f0, :solid, model, RGBA(xac, 1.0f0))
-            push!(axis_vis, spine)
-        end
-        if alpha(yaxis[:foreground_color_axis]) > 0
-            spine = draw_grid_lines(sp, ytick_segs, 1f0, :solid, model, RGBA(yac, 1.0f0))
-            push!(axis_vis, spine)
-        end
-    end
    fcolor = Plots.gl_color(xaxis[:foreground_color_axis])

    xlim = Plots.axis_limits(xaxis)
    ylim = Plots.axis_limits(yaxis)

-    if !(xaxis[:ticks] in (nothing, false, :none)) && !(sp[:framestyle] == :none) && xaxis[:showaxis]
+    if !(xaxis[:ticks] in (nothing, false, :none))
        ticklabels = map(model) do m
            mirror = xaxis[:mirror]
-            t, positions, offsets = draw_ticks(xaxis, xticks, true, sp[:framestyle] == :origin, ylim, m)
+            t, positions, offsets = draw_ticks(xaxis, xticks, true, ylim, m)
+            mirror = xaxis[:mirror]
+            t, positions, offsets = draw_ticks(
+                yaxis, yticks, false, xlim, m,
+                t, positions, offsets
+            )
        end
        kw_args = Dict{Symbol, Any}(
            :position => map(x-> x[2], ticklabels),
            :offset => map(last, ticklabels),
            :color => fcolor,
-            :relative_scale => pointsize(tickfont(xaxis)),
+            :relative_scale => pointsize(xaxis[:tickfont]),
            :scale_primitive => false
        )
        push!(axis_vis, visualize(map(first, ticklabels), Style(:default), kw_args))
    end

-    if !(yaxis[:ticks] in (nothing, false, :none)) && !(sp[:framestyle] == :none) && yaxis[:showaxis]
-        ticklabels = map(model) do m
-            mirror = yaxis[:mirror]
-            t, positions, offsets = draw_ticks(yaxis, yticks, false, sp[:framestyle] == :origin, xlim, m)
-        end
-        kw_args = Dict{Symbol, Any}(
-            :position => map(x-> x[2], ticklabels),
-            :offset => map(last, ticklabels),
-            :color => fcolor,
-            :relative_scale => pointsize(tickfont(xaxis)),
-            :scale_primitive => false
-        )
-        push!(axis_vis, visualize(map(first, ticklabels), Style(:default), kw_args))
-    end
-
-    xbc = Colors.color(Plots.gl_color(xaxis[:foreground_color_border]))
-    ybc = Colors.color(Plots.gl_color(yaxis[:foreground_color_border]))
-    intensity = sp[:framestyle] == :semi ? 0.5f0 : 1.0f0
-    if sp[:framestyle] in (:box, :semi)
-        xborder = draw_grid_lines(sp, xborder_segs, intensity, :solid, model, RGBA(xbc, intensity))
-        yborder = draw_grid_lines(sp, yborder_segs, intensity, :solid, model, RGBA(ybc, intensity))
-        push!(axis_vis, xborder, yborder)
-    end
-
    area_w = GeometryTypes.widths(area)
    if sp[:title] != ""
-        tf = titlefont(sp)
-        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :top, tf.rotation, tf.color)
+        tf = sp[:titlefont]; color = gl_color(sp[:foreground_color_title])
+        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :top, tf.rotation, color)
        xy = Point2f0(area.w/2, area_w[2] + pointsize(tf)/2)
        kw = Dict(:model => text_model(font, xy), :scale_primitive => true)
        extract_font(font, kw)
        t = PlotText(sp[:title], font)
-        push!(axis_vis, glvisualize_text(xy, t, kw))
+        push!(axis_vis, text(xy, t, kw))
    end
    if xaxis[:guide] != ""
-        tf = guidefont(xaxis)
+        tf = xaxis[:guidefont]; color = gl_color(xaxis[:foreground_color_guide])
        xy = Point2f0(area.w/2, - pointsize(tf)/2)
-        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :bottom, tf.rotation, tf.color)
+        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :bottom, tf.rotation, color)
        kw = Dict(:model => text_model(font, xy), :scale_primitive => true)
        t = PlotText(xaxis[:guide], font)
        extract_font(font, kw)
-        push!(axis_vis, glvisualize_text(xy, t, kw))
+        push!(axis_vis, text(xy, t, kw))
    end

    if yaxis[:guide] != ""
-        tf = guidefont(yaxis)
-        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :top, 90f0, tf.color)
+        tf = yaxis[:guidefont]; color = gl_color(yaxis[:foreground_color_guide])
+        font = Plots.Font(tf.family, tf.pointsize, :hcenter, :top, 90f0, color)
        xy = Point2f0(-pointsize(tf)/2, area.h/2)
        kw = Dict(:model => text_model(font, xy), :scale_primitive=>true)
        t = PlotText(yaxis[:guide], font)
        extract_font(font, kw)
-        push!(axis_vis, glvisualize_text(xy, t, kw))
+        push!(axis_vis, text(xy, t, kw))
    end

    axis_vis
@@ -841,9 +829,9 @@ function gl_bar(d, kw_args)
    # compute half-width of bars
    bw = nothing
    hw = if bw == nothing
-        ignorenan_mean(diff(x))
+        mean(diff(x))
    else
-        Float64[_cycle(bw,i)*0.5 for i=1:length(x)]
+        Float64[cycle(bw,i)*0.5 for i=1:length(x)]
    end

    # make fillto a vector... default fills to 0
@@ -852,12 +840,12 @@ function gl_bar(d, kw_args)
        fillto = 0
    end
    # create the bar shapes by adding x/y segments
-    positions, scales = Array{Point2f0}(ny), Array{Vec2f0}(ny)
+    positions, scales = Array(Point2f0, ny), Array(Vec2f0, ny)
    m = Reactive.value(kw_args[:model])
    sx, sy = m[1,1], m[2,2]
    for i=1:ny
        center = x[i]
-        hwi = abs(_cycle(hw,i)); yi = y[i]; fi = _cycle(fillto,i)
+        hwi = abs(cycle(hw,i)); yi = y[i]; fi = cycle(fillto,i)
        if Plots.isvertical(d)
            sz = (hwi*sx, yi*sy)
        else
@@ -893,7 +881,7 @@ function gl_boxplot(d, kw_args)
    sx, sy = m[1,1], m[2,2]
    for (i,glabel) in enumerate(glabels)
        # filter y
-        values = y[filter(i -> _cycle(x,i) == glabel, 1:length(y))]
+        values = y[filter(i -> cycle(x,i) == glabel, 1:length(y))]
        # compute quantiles
        q1,q2,q3,q4,q5 = quantile(values, linspace(0,1,5))
        # notch
@@ -906,7 +894,7 @@ function gl_boxplot(d, kw_args)

        # make the shape
        center = Plots.discrete_value!(d[:subplot][:xaxis], glabel)[1]
-        hw = d[:bar_width] == nothing ? Plots._box_halfwidth*2 : _cycle(d[:bar_width], i)
+        hw = d[:bar_width] == nothing ? Plots._box_halfwidth*2 : cycle(d[:bar_width], i)
        l, m, r = center - hw/2, center, center + hw/2

        # internal nodes for notches
@@ -924,7 +912,7 @@ function gl_boxplot(d, kw_args)
            end
            # change q1 and q5 to show outliers
            # using maximum and minimum values inside the limits
-            q1, q5 = ignorenan_extrema(inside)
+            q1, q5 = extrema(inside)
        end
        # Box
        if notch
@@ -1003,9 +991,9 @@ function scale_for_annotations!(series::Series, scaletype::Symbol = :pixels)
        # we use baseshape to overwrite the markershape attribute
        # with a list of custom shapes for each
        msw, msh = anns.scalefactor
-        offsets = Array{Vec2f0}(length(anns.strs))
+        offsets = Array(Vec2f0, length(anns.strs))
        series[:markersize] = map(1:length(anns.strs)) do i
-            str = _cycle(anns.strs, i)
+            str = cycle(anns.strs, i)
            # get the width and height of the string (in mm)
            sw, sh = text_size(str, anns.font.pointsize)

@@ -1118,7 +1106,7 @@ function _display(plt::Plot{GLVisualizeBackend}, visible = true)
                    kw = copy(kw_args)
                    fr = d[:fillrange]
                    ps = if all(x-> x >= 0, diff(d[:x])) # if is monotonic
-                        vcat(points, Point2f0[(points[i][1], _cycle(fr, i)) for i=length(points):-1:1])
+                        vcat(points, Point2f0[(points[i][1], cycle(fr, i)) for i=length(points):-1:1])
                    else
                        points
                    end
@@ -1153,7 +1141,8 @@ function _display(plt::Plot{GLVisualizeBackend}, visible = true)
                vis = gl_bar(d, kw_args)
            elseif st == :image
                extract_extrema(d, kw_args)
-                vis = GL.gl_image(d[:z].surf, kw_args)
+                z = transpose_z(series, d[:z].surf, false)
+                vis = GL.gl_image(z, kw_args)
            elseif st == :boxplot
                 extract_c(d, kw_args, :fill)
                 vis = gl_boxplot(d, kw_args)
@@ -1182,9 +1171,9 @@ function _display(plt::Plot{GLVisualizeBackend}, visible = true)
            anns = series[:series_annotations]
            for (x, y, str, font) in EachAnn(anns, d[:x], d[:y])
                txt_args = Dict{Symbol, Any}(:model => eye(GLAbstraction.Mat4f0))
-                x, y = Reactive.value(model_m) * GeometryTypes.Vec{4, Float32}(x, y, 0, 1)
+                x, y = Reactive.value(model_m) * Vec{4, Float32}(x, y, 0, 1)
                extract_font(font, txt_args)
-                t = glvisualize_text(Point2f0(x, y), PlotText(str, font), txt_args)
+                t = text(Point2f0(x, y), PlotText(str, font), txt_args)
                GLVisualize._view(t, sp_screen, camera = :perspective)
            end

@@ -1193,7 +1182,7 @@ function _display(plt::Plot{GLVisualizeBackend}, visible = true)
        if _3d
            GLAbstraction.center!(sp_screen)
        end
-        GLAbstraction.post_empty()
+        Reactive.post_empty()
        yield()
    end
 end
@@ -1208,7 +1197,10 @@ function _show(io::IO, ::MIME"image/png", plt::Plot{GLVisualizeBackend})
    GLWindow.render_frame(GLWindow.rootscreen(plt.o))
    GLWindow.swapbuffers(plt.o)
    buff = GLWindow.screenbuffer(plt.o)
-    png = map(RGB{U8}, buff)
+    png = Images.Image(map(RGB{U8}, buff),
+        colorspace = "sRGB",
+        spatialorder = ["y", "x"]
+    )
    FileIO.save(FileIO.Stream(FileIO.DataFormat{:PNG}, io), png)
 end

@@ -1219,7 +1211,7 @@ function gl_image(img, kw_args)
    visualize(img, Style(:default), kw_args)
 end

-function handle_segment(lines, line_segments, points::Vector{P}, segment) where P
+function handle_segment{P}(lines, line_segments, points::Vector{P}, segment)
    (isempty(segment) || length(segment) < 2) && return
    if length(segment) == 2
         append!(line_segments, view(points, segment))
@@ -1288,7 +1280,7 @@ function gl_scatter(points, kw_args)
    if haskey(kw_args, :stroke_width)
        s = Reactive.value(kw_args[:scale])
        sw = kw_args[:stroke_width]
-        if sw*5 > _cycle(Reactive.value(s), 1)[1] # restrict marker stroke to 1/10th of scale (and handle arrays of scales)
+        if sw*5 > cycle(Reactive.value(s), 1)[1] # restrict marker stroke to 1/10th of scale (and handle arrays of scales)
            kw_args[:stroke_width] = s[1] / 5f0
        end
    end
@@ -1366,8 +1358,8 @@ function gl_contour(x, y, z, kw_args)
    if kw_args[:fillrange] != nothing

        delete!(kw_args, :intensity)
-        I = GLVisualize.Intensity{Float32}
-        main = [I(z[j,i]) for i=1:size(z, 2), j=1:size(z, 1)]
+        I = GLVisualize.Intensity{1, Float32}
+        main = I[z[j,i] for i=1:size(z, 2), j=1:size(z, 1)]
        return visualize(main, Style(:default), kw_args)

    else
@@ -1375,7 +1367,7 @@ function gl_contour(x, y, z, kw_args)
        T = eltype(z)
        levels = Contour.contours(map(T, x), map(T, y), z, h)
        result = Point2f0[]
-        zmin, zmax = get(kw_args, :limits, Vec2f0(ignorenan_extrema(z)))
+        zmin, zmax = get(kw_args, :limits, Vec2f0(extrema(z)))
        cmap = get(kw_args, :color_map, get(kw_args, :color, RGBA{Float32}(0,0,0,1)))
        colors = RGBA{Float32}[]
        for c in levels.contours
@@ -1396,10 +1388,10 @@ end


 function gl_heatmap(x,y,z, kw_args)
-    get!(kw_args, :color_norm, Vec2f0(ignorenan_extrema(z)))
+    get!(kw_args, :color_norm, Vec2f0(extrema(z)))
    get!(kw_args, :color_map, Plots.make_gradient(cgrad()))
    delete!(kw_args, :intensity)
-    I = GLVisualize.Intensity{Float32}
+    I = GLVisualize.Intensity{1, Float32}
    heatmap = I[z[j,i] for i=1:size(z, 2), j=1:size(z, 1)]
    tex = GLAbstraction.Texture(heatmap, minfilter=:nearest)
    kw_args[:stroke_width] = 0f0
@@ -1430,8 +1422,6 @@ function label_scatter(d, w, ho)
        color = get(kw, :color, nothing)
        kw[:color] = isa(color, Array) ? first(color) : color
    end
-    strcolor = get(kw, :stroke_color, RGBA{Float32}(0,0,0,0))
-    kw[:stroke_color] = isa(strcolor, Array) ? first(strcolor) : strcolor
    p = get(kw, :primitive, GeometryTypes.Circle)
    if isa(p, GLNormalMesh)
        bb = GeometryTypes.AABB{Float32}(GeometryTypes.vertices(p))
@@ -1446,9 +1436,6 @@ function label_scatter(d, w, ho)
        kw[:scale] = Vec3f0(w/2)
        delete!(kw, :offset)
    end
-    if isa(p, Array)
-        kw[:primitive] = GeometryTypes.Circle
-    end
    GL.gl_scatter(Point2f0[(w/2, ho)], kw)
 end

@@ -1486,13 +1473,14 @@ function make_label(sp, series, i)
    else
        series[:label]
    end
-    ft = legendfont(sp)
-    font = Plots.Font(ft.family, ft.pointsize, :left, :bottom, 0.0, ft.color)
+    color = sp[:foreground_color_legend]
+    ft = sp[:legendfont]
+    font = Plots.Font(ft.family, ft.pointsize, :left, :bottom, 0.0, color)
    xy = Point2f0(w+gap, 0.0)
    kw = Dict(:model => text_model(font, xy), :scale_primitive=>false)
    extract_font(font, kw)
    t = PlotText(labeltext, font)
-    push!(result, glvisualize_text(xy, t, kw))
+    push!(result, text(xy, t, kw))
    GLAbstraction.Context(result...), i
 end

@@ -1,658 +0,0 @@
-#HDF5 Plots: Save/replay plots to/from HDF5
-#-------------------------------------------------------------------------------
-
-#==Usage
-===============================================================================
-Write to .hdf5 file using:
-    p = plot(...)
-   Plots.hdf5plot_write(p, "plotsave.hdf5")
-
-Read from .hdf5 file using:
-    pyplot() #Must first select backend
-    pread = Plots.hdf5plot_read("plotsave.hdf5")
-    display(pread)
-==#
-
-
-#==TODO
-===============================================================================
- 1. Support more features
-    - SeriesAnnotations & GridLayout known to be missing.
- 3. Improve error handling.
-    - Will likely crash if file format is off.
- 2. Save data in a folder parallel to "plot".
-    - Will make it easier for users to locate data.
-    - Use HDF5 reference to link data?
- 3. Develop an actual versioned file format.
-    - Should have some form of backward compatibility.
-    - Should be reliable for archival purposes.
-==#
-
-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "hdf5.jl")) 
-end
-
-import FixedPointNumbers: N0f8 #In core Julia
-
-#Dispatch types:
-struct HDF5PlotNative; end #Indentifies a data element that can natively be handled by HDF5
-struct HDF5CTuple; end #Identifies a "complex" tuple structure
-
-mutable struct HDF5Plot_PlotRef
-	ref::Union{Plot, Void}
-end
-
-
-#==Useful constants
-===============================================================================#
-const _hdf5_plotroot = "plot"
-const _hdf5_dataroot = "data" #TODO: Eventually move data to different root (easier to locate)?
-const _hdf5plot_datatypeid = "TYPE" #Attribute identifying type
-const _hdf5plot_countid = "COUNT" #Attribute for storing count
-
-#Dict has problems using "Types" as keys.  Initialize in "_initialize_backend":
-const HDF5PLOT_MAP_STR2TELEM = Dict{String, Type}()
-const HDF5PLOT_MAP_TELEM2STR = Dict{Type, String}()
-
-#Don't really like this global variable... Very hacky
-const HDF5PLOT_PLOTREF = HDF5Plot_PlotRef(nothing)
-
-#Simple sub-structures that can just be written out using _hdf5plot_gwritefields:
-const HDF5PLOT_SIMPLESUBSTRUCT = Union{Font, BoundingBox,
-	GridLayout, RootLayout, ColorGradient, SeriesAnnotations, PlotText
-}
-
-
-#==
-===============================================================================#
-
-const _hdf5_attr = merge_with_base_supported([
-    :annotations,
-    :background_color_legend, :background_color_inside, :background_color_outside,
-    :foreground_color_grid, :foreground_color_legend, :foreground_color_title,
-    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
-    :label,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :fillrange, :fillcolor, :fillalpha,
-    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location, :titlefont,
-    :window_title,
-    :guide, :lims, :ticks, :scale, :flip, :rotation,
-    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, :colorbar,
-    :marker_z, :line_z, :fill_z,
-    :levels,
-    :ribbon, :quiver, :arrow,
-    :orientation,
-    :overwrite_figure,
-    :polar,
-    :normalize, :weights,
-    :contours, :aspect_ratio,
-    :match_dimensions,
-    :clims,
-    :inset_subplots,
-    :dpi,
-    :colorbar_title,
-  ])
-const _hdf5_seriestype = [
-        :path, :steppre, :steppost, :shape,
-        :scatter, :hexbin, #:histogram2d, :histogram,
-        # :bar,
-        :heatmap, :pie, :image,
-        :contour, :contour3d, :path3d, :scatter3d, :surface, :wireframe
-    ]
-const _hdf5_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _hdf5_marker = vcat(_allMarkers, :pixel)
-const _hdf5_scale = [:identity, :ln, :log2, :log10]
-is_marker_supported(::HDF5Backend, shape::Shape) = true
-
-function add_backend_string(::HDF5Backend)
-    """
-    if !Plots.is_installed("HDF5")
-        Pkg.add("HDF5")
-    end
-    """
-end
-
-
-#==Helper functions
-===============================================================================#
-
-_hdf5_plotelempath(subpath::String) = "$_hdf5_plotroot/$subpath"
-_hdf5_datapath(subpath::String) = "$_hdf5_dataroot/$subpath"
-_hdf5_map_str2telem(k::String) = HDF5PLOT_MAP_STR2TELEM[k]
-_hdf5_map_str2telem(v::Vector) = HDF5PLOT_MAP_STR2TELEM[v[1]]
-
-function _hdf5_merge!(dest::Dict, src::Dict)
-    for (k, v) in src
-        if isa(v, Axis)
-            _hdf5_merge!(dest[k].d, v.d)
-        else
-            dest[k] = v
-        end
-    end
-    return
-end
-
-
-#==
-===============================================================================#
-
-function _initialize_backend(::HDF5Backend)
-    @eval begin
-        import HDF5
-        export HDF5
-        if length(HDF5PLOT_MAP_TELEM2STR) < 1
-            #Possible element types of high-level data types:
-            const telem2str = Dict{String, Type}(
-                "NATIVE" => HDF5PlotNative,
-                "VOID" => Void,
-                "BOOL" => Bool,
-                "SYMBOL" => Symbol,
-                "TUPLE" => Tuple,
-                "CTUPLE" => HDF5CTuple, #Tuple of complex structures
-                "RGBA" => ARGB{N0f8},
-                "EXTREMA" => Extrema,
-                "LENGTH" => Length,
-                "ARRAY" => Array, #Dict won't allow Array to be key in HDF5PLOT_MAP_TELEM2STR
-
-                #Sub-structure types:
-                "FONT" => Font,
-                "BOUNDINGBOX" => BoundingBox,
-                "GRIDLAYOUT" => GridLayout,
-                "ROOTLAYOUT" => RootLayout,
-                "SERIESANNOTATIONS" => SeriesAnnotations,
-#                "PLOTTEXT" => PlotText,
-                "COLORGRADIENT" => ColorGradient,
-                "AXIS" => Axis,
-                "SUBPLOT" => Subplot,
-                "NULLABLE" => Nullable,
-            )
-            merge!(HDF5PLOT_MAP_STR2TELEM, telem2str)
-            merge!(HDF5PLOT_MAP_TELEM2STR, Dict{Type, String}(v=>k for (k,v) in HDF5PLOT_MAP_STR2TELEM))
-        end
-    end
-end
-
-# ---------------------------------------------------------------------------
-
-# Create the window/figure for this backend.
-function _create_backend_figure(plt::Plot{HDF5Backend})
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# # this is called early in the pipeline, use it to make the plot current or something
-# function _prepare_plot_object(plt::Plot{HDF5Backend})
-# end
-
-# ---------------------------------------------------------------------------
-
-# Set up the subplot within the backend object.
-function _initialize_subplot(plt::Plot{HDF5Backend}, sp::Subplot{HDF5Backend})
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# Add one series to the underlying backend object.
-# Called once per series
-# NOTE: Seems to be called when user calls plot()... even if backend
-#       plot, sp.o has not yet been constructed...
-function _series_added(plt::Plot{HDF5Backend}, series::Series)
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# When series data is added/changed, this callback can do dynamic updates to the backend object.
-# note: if the backend rebuilds the plot from scratch on display, then you might not do anything here.
-function _series_updated(plt::Plot{HDF5Backend}, series::Series)
-    #Do nothing
-end
-
-# ---------------------------------------------------------------------------
-
-# called just before updating layout bounding boxes... in case you need to prep
-# for the calcs
-function _before_layout_calcs(plt::Plot{HDF5Backend})
-    #Do nothing
-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{HDF5Backend})
-    #Do nothing
-end
-
-# ----------------------------------------------------------------
-
-# Override this to update plot items (title, xlabel, etc), and add annotations (d[:annotations])
-function _update_plot_object(plt::Plot{HDF5Backend})
-    #Do nothing
-end
-
-# ----------------------------------------------------------------
-
-_show(io::IO, mime::MIME"text/plain", plt::Plot{HDF5Backend}) = nothing #Don't show
-
-# ----------------------------------------------------------------
-
-# Display/show the plot (open a GUI window, or browser page, for example).
-function _display(plt::Plot{HDF5Backend})
-    msg = "HDF5 interface does not support `display()` function."
-    msg *= "\nUse `Plots.hdf5plot_write(::String)` method to write to .HDF5 \"plot\" file instead."
-    warn(msg)
-    return
-end
-
-
-#==HDF5 write functions
-===============================================================================#
-
-function _hdf5plot_writetype(grp, k::String, tstr::Array{String})
-    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, k::String, T::Type)
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    d = HDF5.d_open(grp, k)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_overwritetype(grp, k::String, T::Type)
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    d = HDF5.d_open(grp, k)
-    HDF5.a_delete(d, _hdf5plot_datatypeid)
-    HDF5.a_write(d, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, T::Type) #Write directly to group
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_overwritetype(grp, T::Type) #Write directly to group
-    tstr = HDF5PLOT_MAP_TELEM2STR[T]
-    HDF5.a_delete(grp, _hdf5plot_datatypeid)
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, ::Type{Array{T}}) where T<:Any
-    tstr = HDF5PLOT_MAP_TELEM2STR[Array] #ANY
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype(grp, ::Type{T}) where T<:BoundingBox
-    tstr = HDF5PLOT_MAP_TELEM2STR[BoundingBox]
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writecount(grp, n::Int) #Write directly to group
-    HDF5.a_write(grp, _hdf5plot_countid, n)
-end
-function _hdf5plot_gwritefields(grp, k::String, v)
-    grp = HDF5.g_create(grp, k)
-    for _k in fieldnames(v)
-        _v = getfield(v, _k)
-        kstr = string(_k)
-        _hdf5plot_gwrite(grp, kstr, _v)
-    end
-    _hdf5plot_writetype(grp, typeof(v))
-    return
-end
-
-# Write data
-# ----------------------------------------------------------------
-
-function _hdf5plot_gwrite(grp, k::String, v) #Default
-    grp[k] = v
-    _hdf5plot_writetype(grp, k, HDF5PlotNative)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Array{T}) where T<:Number #Default for arrays
-    grp[k] = v
-    _hdf5plot_writetype(grp, k, HDF5PlotNative)
-end
-#=
-function _hdf5plot_gwrite(grp, k::String, v::Array{Any})
-#    @show grp, k
-    warn("Cannot write Array: $k=$v")
-end
-=#
-function _hdf5plot_gwrite(grp, k::String, v::Void)
-    grp[k] = 0
-    _hdf5plot_writetype(grp, k, Void)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Bool)
-    grp[k] = Int(v)
-    _hdf5plot_writetype(grp, k, Bool)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Symbol)
-    grp[k] = string(v)
-    _hdf5plot_writetype(grp, k, Symbol)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Tuple)
-    varr = [v...]
-    elt = eltype(varr)
-#    if isleaftype(elt)
-
-    _hdf5plot_gwrite(grp, k, varr)
-    if elt <: Number
-        #We just wrote a simple dataset
-        _hdf5plot_overwritetype(grp, k, Tuple)
-    else #Used a more complex scheme (using subgroups):
-        _hdf5plot_overwritetype(grp[k], HDF5CTuple)
-    end
-    #NOTE: _hdf5plot_overwritetype overwrites "Array" type with "Tuple".
-end
-function _hdf5plot_gwrite(grp, k::String, d::Dict)
-#    warn("Cannot write dict: $k=$d")
-end
-function _hdf5plot_gwrite(grp, k::String, v::Range)
-    _hdf5plot_gwrite(grp, k, collect(v)) #For now
-end
-function _hdf5plot_gwrite(grp, k::String, v::ARGB{N0f8})
-    grp[k] = [v.r.i, v.g.i, v.b.i, v.alpha.i]
-    _hdf5plot_writetype(grp, k, ARGB{N0f8})
-end
-function _hdf5plot_gwrite(grp, k::String, v::Colorant)
-    _hdf5plot_gwrite(grp, k, ARGB{N0f8}(v))
-end
-#Custom vector (when not using simple numeric type):
-function _hdf5plot_gwritearray(grp, k::String, v::Array{T}) where T
-    if "annotations" == k;
-        return #Hack.  Does not yet support annotations.
-    end
-
-    vgrp = HDF5.g_create(grp, k)
-    _hdf5plot_writetype(vgrp, Array) #ANY
-    sz = size(v)
-
-    for iter in eachindex(v)
-        coord = ind2sub(sz, iter)
-        elem = v[iter]
-        idxstr = join(coord, "_")
-        _hdf5plot_gwrite(vgrp, "v$idxstr", v[iter])
-    end
-
-    _hdf5plot_gwrite(vgrp, "dim", [sz...])
-    return
-end
-_hdf5plot_gwrite(grp, k::String, v::Array) =
-	_hdf5plot_gwritearray(grp, k, v)
-function _hdf5plot_gwrite(grp, k::String, v::Extrema)
-    grp[k] = [v.emin, v.emax]
-    _hdf5plot_writetype(grp, k, Extrema)
-end
-function _hdf5plot_gwrite(grp, k::String, v::Length{T}) where T
-    grp[k] = v.value
-    _hdf5plot_writetype(grp, k, [HDF5PLOT_MAP_TELEM2STR[Length], string(T)])
-end
-
-# Write more complex structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_gwrite(grp, k::String, v::Plot)
-    #Don't write plot references
-end
-function _hdf5plot_gwrite(grp, k::String, v::HDF5PLOT_SIMPLESUBSTRUCT)
-    _hdf5plot_gwritefields(grp, k, v)
-    return
-end
-function _hdf5plot_gwrite(grp, k::String, v::Axis)
-    grp = HDF5.g_create(grp, k)
-    for (_k, _v) in v.d
-        kstr = string(_k)
-        _hdf5plot_gwrite(grp, kstr, _v)
-    end
-    _hdf5plot_writetype(grp, Axis)
-    return
-end
-#TODO: "Properly" support Nullable using _hdf5plot_writetype?
-function _hdf5plot_gwrite(grp, k::String, v::Nullable)
-    if isnull(v)
-        _hdf5plot_gwrite(grp, k, nothing)
-    else
-        _hdf5plot_gwrite(grp, k, v.value)
-    end
-    return
-end
-
-function _hdf5plot_gwrite(grp, k::String, v::SeriesAnnotations)
-    #Currently no support for SeriesAnnotations
-    return
-end
-function _hdf5plot_gwrite(grp, k::String, v::Subplot)
-    grp = HDF5.g_create(grp, k)
-    _hdf5plot_gwrite(grp, "index", v[:subplot_index])
-    _hdf5plot_writetype(grp, Subplot)
-    return
-end
-function _hdf5plot_write(grp, d::Dict)
-    for (k, v) in d
-        kstr = string(k)
-        _hdf5plot_gwrite(grp, kstr, v)
-    end
-    return
-end
-
-# Write main plot structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_write(sp::Subplot{HDF5Backend}, subpath::String, f)
-    f = f::HDF5.HDF5File #Assert
-    grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/attr"))
-    _hdf5plot_write(grp, sp.attr)
-    grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/series_list"))
-    _hdf5plot_writecount(grp, length(sp.series_list))
-    for (i, series) in enumerate(sp.series_list)
-        grp = HDF5.g_create(f, _hdf5_plotelempath("$subpath/series_list/series$i"))
-        _hdf5plot_write(grp, series.d)
-    end
-
-    return
-end
-
-function _hdf5plot_write(plt::Plot{HDF5Backend}, f)
-    f = f::HDF5.HDF5File #Assert
-
-    grp = HDF5.g_create(f, _hdf5_plotelempath("attr"))
-    _hdf5plot_write(grp, plt.attr)
-
-    grp = HDF5.g_create(f, _hdf5_plotelempath("subplots"))
-    _hdf5plot_writecount(grp, length(plt.subplots))
-
-    for (i, sp) in enumerate(plt.subplots)
-        _hdf5plot_write(sp, "subplots/subplot$i", f)
-    end
-
-    return
-end
-function hdf5plot_write(plt::Plot{HDF5Backend}, path::AbstractString)
-    HDF5.h5open(path, "w") do file
-        _hdf5plot_write(plt, file)
-    end
-end
-hdf5plot_write(path::AbstractString) = hdf5plot_write(current(), path)
-
-
-#==HDF5 playback (read) functions
-===============================================================================#
-
-function _hdf5plot_readcount(grp) #Read directly from group
-    return HDF5.a_read(grp, _hdf5plot_countid)
-end
-
-_hdf5plot_convert(T::Type{HDF5PlotNative}, v) = v
-_hdf5plot_convert(T::Type{Void}, v) = nothing
-_hdf5plot_convert(T::Type{Bool}, v) = (v!=0)
-_hdf5plot_convert(T::Type{Symbol}, v) = Symbol(v)
-_hdf5plot_convert(T::Type{Tuple}, v) = tuple(v...) #With Vector{T<:Number}
-function _hdf5plot_convert(T::Type{ARGB{N0f8}}, v)
-    r, g, b, a = reinterpret(N0f8, v)
-    return Colors.ARGB{N0f8}(r, g, b, a)
-end
-_hdf5plot_convert(T::Type{Extrema}, v) = Extrema(v[1], v[2])
-
-# Read data structures:
-# ----------------------------------------------------------------
-
-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}, dtid)
-    grp = HDF5.g_open(grp, k)
-
-    family = _hdf5plot_read(grp, "family")
-    pointsize = _hdf5plot_read(grp, "pointsize")
-    halign = _hdf5plot_read(grp, "halign")
-    valign = _hdf5plot_read(grp, "valign")
-    rotation = _hdf5plot_read(grp, "rotation")
-    color = _hdf5plot_read(grp, "color")
-    return Font(family, pointsize, halign, valign, rotation, color)
-end
-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
-    sz = tuple(sz...)
-    result = Array{Any}(sz)
-
-    for iter in eachindex(result)
-        coord = ind2sub(sz, iter)
-        idxstr = join(coord, "_")
-        result[iter] = _hdf5plot_read(grp, "v$idxstr")
-    end
-
-    #Hack: Implicitly make Julia detect element type.
-    #      (Should probably write it explicitly to file)
-    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}, dtid)
-    v = _hdf5plot_read(grp, k, Array, dtid)
-    return tuple(v...)
-end
-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}, 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}, dtid) = RootLayout()
-function _hdf5plot_read(grp, k::String, T::Type{GridLayout}, dtid)
-    grp = HDF5.g_open(grp, k)
-
-#    parent = _hdf5plot_read(grp, "parent")
-parent = RootLayout()
-    minpad = _hdf5plot_read(grp, "minpad")
-    bbox = _hdf5plot_read(grp, "bbox")
-    grid = _hdf5plot_read(grp, "grid")
-    widths = _hdf5plot_read(grp, "widths")
-    heights = _hdf5plot_read(grp, "heights")
-    attr = KW() #TODO support attr: _hdf5plot_read(grp, "attr")
-
-    return GridLayout(parent, minpad, bbox, grid, widths, heights, attr)
-end
-function _hdf5plot_read(grp, k::String, T::Type{Axis}, dtid)
-    grp = HDF5.g_open(grp, k)
-    kwlist = KW()
-    _hdf5plot_read(grp, kwlist)
-    return Axis([], kwlist)
-end
-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
-function _hdf5plot_read(grp, k::String)
-    dtid = HDF5.a_read(grp[k], _hdf5plot_datatypeid)
-    T = _hdf5_map_str2telem(dtid) #expect exception
-    return _hdf5plot_read(grp, k, T, dtid)
-end
-
-#Read in values in group to populate d:
-function _hdf5plot_read(grp, d::Dict)
-    gnames = names(grp)
-    for k in gnames
-        try
-            v = _hdf5plot_read(grp, k)
-            d[Symbol(k)] = v
-        catch e
-            @show e
-            @show grp
-            warn("Could not read field $k")
-        end
-    end
-    return
-end
-
-# Read main plot structures:
-# ----------------------------------------------------------------
-
-function _hdf5plot_read(sp::Subplot, subpath::String, f)
-    f = f::HDF5.HDF5File #Assert
-
-    grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/attr"))
-    kwlist = KW()
-    _hdf5plot_read(grp, kwlist)
-    _hdf5_merge!(sp.attr, kwlist)
-
-    grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/series_list"))
-    nseries = _hdf5plot_readcount(grp)
-
-    for i in 1:nseries
-        grp = HDF5.g_open(f, _hdf5_plotelempath("$subpath/series_list/series$i"))
-        kwlist = KW()
-        _hdf5plot_read(grp, kwlist)
-        plot!(sp, kwlist[:x], kwlist[:y]) #Add data & create data structures
-        _hdf5_merge!(sp.series_list[end].d, kwlist)
-    end
-
-    return
-end
-
-function _hdf5plot_read(plt::Plot, f)
-    f = f::HDF5.HDF5File #Assert
-    #Assumpltion: subplots are already allocated (plt.subplots)
-
-    HDF5PLOT_PLOTREF.ref = plt #Used when reading "layout"
-    grp = HDF5.g_open(f, _hdf5_plotelempath("attr"))
-    _hdf5plot_read(grp, plt.attr)
-
-    for (i, sp) in enumerate(plt.subplots)
-        _hdf5plot_read(sp, "subplots/subplot$i", f)
-    end
-
-    return
-end
-
-function hdf5plot_read(path::AbstractString)
-    plt = nothing
-    HDF5.h5open(path, "r") do file
-        grp = HDF5.g_open(file, _hdf5_plotelempath("subplots"))
-        n = _hdf5plot_readcount(grp)
-        plt = plot(layout=n) #Get reference to a new plot
-        _hdf5plot_read(plt, file)
-    end
-    return plt
-end
-
-#Last line
@@ -13,17 +13,12 @@ Add in functionality to Plots.jl:
    :aspect_ratio,
 =#

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "inspectdr.jl"))
-end
-
 # ---------------------------------------------------------------------------
 #TODO: remove features
 const _inspectdr_attr = merge_with_base_supported([
    :annotations,
    :background_color_legend, :background_color_inside, :background_color_outside,
-    # :foreground_color_grid,
-    :foreground_color_legend, :foreground_color_title,
+    :foreground_color_grid, :foreground_color_legend, :foreground_color_title,
    :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
    :label,
    :linecolor, :linestyle, :linewidth, :linealpha,
@@ -32,13 +27,10 @@ const _inspectdr_attr = merge_with_base_supported([
    :markerstrokestyle, #Causes warning not to have it... what is this?
    :fillcolor, :fillalpha, #:fillrange,
 #    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location,
+    :title, :title_location, :titlefont,
    :window_title,
    :guide, :lims, :scale, #:ticks, :flip, :rotation,
-    :titlefontfamily, :titlefontsize, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
+    :tickfont, :guidefont, :legendfont,
    :grid, :legend, #:colorbar,
 #    :marker_z,
 #    :line_z,
@@ -46,7 +38,7 @@ const _inspectdr_attr = merge_with_base_supported([
 #   :ribbon, :quiver, :arrow,
 #    :orientation,
    :overwrite_figure,
-    :polar,
+#    :polar,
 #    :normalize, :weights,
 #    :contours, :aspect_ratio,
    :match_dimensions,
@@ -74,9 +66,6 @@ const _inspectdr_scale = [:identity, :ln, :log2, :log10]

 is_marker_supported(::InspectDRBackend, shape::Shape) = true

-_inspectdr_to_pixels(bb::BoundingBox) =
-    InspectDR.BoundingBox(to_pixels(left(bb)), to_pixels(right(bb)), to_pixels(top(bb)), to_pixels(bottom(bb)))
-
 #Do we avoid Map to avoid possible pre-comile issues?
 function _inspectdr_mapglyph(s::Symbol)
    s == :rect && return :square
@@ -136,17 +125,16 @@ end

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

-function _inspectdr_getscale(s::Symbol, yaxis::Bool)
+function _inspectdr_getscale(s::Symbol)
 #TODO: Support :asinh, :sqrt
-    kwargs = yaxis ? (:tgtmajor=>8, :tgtminor=>2) : () #More grid lines on y-axis
    if :log2 == s
-        return InspectDR.AxisScale(:log2; kwargs...)
+        return InspectDR.AxisScale(:log2)
    elseif :log10 == s
-        return InspectDR.AxisScale(:log10; kwargs...)
+        return InspectDR.AxisScale(:log10)
    elseif :ln == s
-        return InspectDR.AxisScale(:ln; kwargs...)
+        return InspectDR.AxisScale(:ln)
    else #identity
-        return InspectDR.AxisScale(:lin; kwargs...)
+        return InspectDR.AxisScale(:lin)
    end
 end

@@ -170,7 +158,7 @@ function _initialize_backend(::InspectDRBackend; kw...)
            2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
        )

-        mutable struct InspecDRPlotRef
+        type InspecDRPlotRef
            mplot::Union{Void, InspectDR.Multiplot}
            gui::Union{Void, InspectDR.GtkPlot}
        end
@@ -179,7 +167,7 @@ function _initialize_backend(::InspectDRBackend; kw...)
        _inspectdr_getmplot(r::InspecDRPlotRef) = r.mplot

        _inspectdr_getgui(::Any) = nothing
-        _inspectdr_getgui(gplot::InspectDR.GtkPlot) = (gplot.destroyed ? nothing : gplot)
+        _inspectdr_getgui(gplot::InspectDR.GtkPlot) = (gplot.destroyed? nothing: gplot)
        _inspectdr_getgui(r::InspecDRPlotRef) = _inspectdr_getgui(r.gui)
    end
 end
@@ -221,10 +209,14 @@ end
 # Set up the subplot within the backend object.
 function _initialize_subplot(plt::Plot{InspectDRBackend}, sp::Subplot{InspectDRBackend})
    plot = sp.o
+
    #Don't do anything without a "subplot" object:  Will process later.
    if nothing == plot; return; end
    plot.data = []
-    plot.userannot = [] #Clear old markers/text annotation/polyline "annotation"
+    plot.markers = [] #Clear old markers
+    plot.atext = [] #Clear old annotation
+    plot.apline = [] #Clear old poly lines
+
    return plot
 end

@@ -242,15 +234,9 @@ function _series_added(plt::Plot{InspectDRBackend}, series::Series)
    #Don't do anything without a "subplot" object:  Will process later.
    if nothing == plot; return; end

-    _vectorize(v) = isa(v, Vector) ? v : collect(v) #InspectDR only supports vectors
+    _vectorize(v) = isa(v, Vector)? v: collect(v) #InspectDR only supports vectors
    x = _vectorize(series[:x]); y = _vectorize(series[:y])

-    #No support for polar grid... but can still perform polar transformation:
-    if ispolar(sp)
-        Θ = x; r = y
-        x = r.*cos.(Θ); y = r.*sin.(Θ)
-    end
-
    # doesn't handle mismatched x/y - wrap data (pyplot behaviour):
    nx = length(x); ny = length(y)
    if nx < ny
@@ -273,23 +259,23 @@ For st in :shape:
            nmax = i
            if length(rng) > 1
                linewidth = series[:linewidth]
-                linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i))
-                fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i))
+                linecolor = _inspectdr_mapcolor(cycle(series[:linecolor], i))
+                fillcolor = _inspectdr_mapcolor(cycle(series[:fillcolor], i))
                line = InspectDR.line(
                    style=:solid, width=linewidth, color=linecolor
                )
                apline = InspectDR.PolylineAnnotation(
                    x[rng], y[rng], line=line, fillcolor=fillcolor
                )
-                InspectDR.add(plot, apline)
+                push!(plot.apline, apline)
            end
        end

-        i = (nmax >= 2 ? div(nmax, 2) : nmax) #Must pick one set of colors for legend
+        i = (nmax >= 2? div(nmax, 2): nmax) #Must pick one set of colors for legend
        if i > 1 #Add dummy waveform for legend entry:
            linewidth = series[:linewidth]
-            linecolor = _inspectdr_mapcolor(_cycle(series[:linecolor], i))
-            fillcolor = _inspectdr_mapcolor(_cycle(series[:fillcolor], i))
+            linecolor = _inspectdr_mapcolor(cycle(series[:linecolor], i))
+            fillcolor = _inspectdr_mapcolor(cycle(series[:fillcolor], i))
            wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label])
            wfrm.line = InspectDR.line(
                style=:none, width=linewidth, #linewidth affects glyph
@@ -303,7 +289,7 @@ For st in :shape:
        #NOTE: In Plots.jl, :scatter plots have 0-linewidths (I think).
        linewidth = series[:linewidth]
        #More efficient & allows some support for markerstrokewidth:
-        _style = (0==linewidth ? :none : series[:linestyle])
+        _style = (0==linewidth? :none: series[:linestyle])
        wfrm = InspectDR.add(plot, x, y, id=series[:label])
        wfrm.line = InspectDR.line(
            style = _style,
@@ -342,60 +328,48 @@ end
 # ---------------------------------------------------------------------------

 function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
+    const gridon = InspectDR.grid(vmajor=true, hmajor=true)
+    const gridoff = InspectDR.grid()
    const plot = sp.o
-    const strip = plot.strips[1] #Only 1 strip supported with Plots.jl

    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]
-    xgrid_show = xaxis[:grid]
-    ygrid_show = yaxis[:grid]
-
-    strip.grid = InspectDR.GridRect(
-    	vmajor=xgrid_show, # vminor=xgrid_show,
-    	hmajor=ygrid_show, # hminor=ygrid_show,
-    )
-
-        plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
-        strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
+        xscale = _inspectdr_getscale(xaxis[:scale])
+        yscale = _inspectdr_getscale(yaxis[:scale])
+        plot.axes = InspectDR.AxesRect(xscale, yscale)
        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))
-            xmin, xmax = -rmax, rmax
-            ymin, ymax = -rmax, rmax
-        end
-        plot.xext = InspectDR.PExtents1D() #reset
-        strip.yext = InspectDR.PExtents1D() #reset
-        plot.xext_full = InspectDR.PExtents1D(xmin, xmax)
-        strip.yext_full = InspectDR.PExtents1D(ymin, ymax)
+        plot.ext = InspectDR.PExtents2D() #reset
+        plot.ext_full = InspectDR.PExtents2D(xmin, xmax, ymin, ymax)
    a = plot.annotation
        a.title = sp[:title]
-        a.xlabel = xaxis[:guide]; a.ylabels = [yaxis[:guide]]
+        a.xlabel = xaxis[:guide]; a.ylabel = yaxis[:guide]

    l = plot.layout
-        l[:frame_canvas].fillcolor = _inspectdr_mapcolor(sp[:background_color_subplot])
-        l[:frame_data].fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
-        l[:frame_data].line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
-        l[:font_title] = InspectDR.Font(sp[:titlefontfamily],
-            _inspectdr_mapptsize(sp[:titlefontsize]),
-            color = _inspectdr_mapcolor(sp[:titlefontcolor])
+        l.framedata.fillcolor = _inspectdr_mapcolor(sp[:background_color_inside])
+        l.framedata.line.color = _inspectdr_mapcolor(xaxis[:foreground_color_axis])
+        l.fnttitle = InspectDR.Font(sp[:titlefont].family,
+            _inspectdr_mapptsize(sp[:titlefont].pointsize),
+            color = _inspectdr_mapcolor(sp[:foreground_color_title])
        )
        #Cannot independently control fonts of axes with InspectDR:
-        l[:font_axislabel] = InspectDR.Font(xaxis[:guidefontfamily],
-            _inspectdr_mapptsize(xaxis[:guidefontsize]),
-            color = _inspectdr_mapcolor(xaxis[:guidefontcolor])
+        l.fntaxlabel = InspectDR.Font(xaxis[:guidefont].family,
+            _inspectdr_mapptsize(xaxis[:guidefont].pointsize),
+            color = _inspectdr_mapcolor(xaxis[:foreground_color_guide])
        )
-        l[:font_ticklabel] = InspectDR.Font(xaxis[:tickfontfamily],
-            _inspectdr_mapptsize(xaxis[:tickfontsize]),
-            color = _inspectdr_mapcolor(xaxis[:tickfontcolor])
+        l.fntticklabel = InspectDR.Font(xaxis[:tickfont].family,
+            _inspectdr_mapptsize(xaxis[:tickfont].pointsize),
+            color = _inspectdr_mapcolor(xaxis[:foreground_color_text])
        )
-        l[:enable_legend] = (sp[:legend] != :none)
-        #l[:halloc_legend] = 150 #TODO: compute???
-        l[:font_legend] = InspectDR.Font(sp[:legendfontfamily],
-            _inspectdr_mapptsize(sp[:legendfontsize]),
-            color = _inspectdr_mapcolor(sp[:legendfontcolor])
+        #No independent control of grid???
+        l.grid = sp[:grid]? gridon: gridoff
+    leg = l.legend
+        leg.enabled = (sp[:legend] != :none)
+        #leg.width = 150 #TODO: compute???
+        leg.font = InspectDR.Font(sp[:legendfont].family,
+            _inspectdr_mapptsize(sp[:legendfont].pointsize),
+            color = _inspectdr_mapcolor(sp[:foreground_color_legend])
        )
-        l[:frame_legend].fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
+        leg.frame.fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
 end

 # called just before updating layout bounding boxes... in case you need to prep
@@ -404,13 +378,6 @@ function _before_layout_calcs(plt::Plot{InspectDRBackend})
    const mplot = _inspectdr_getmplot(plt.o)
    if nothing == mplot; return; end

-    mplot.title = plt[:plot_title]
-    if "" == mplot.title
-        #Don't use window_title... probably not what you want.
-        #mplot.title = plt[:window_title]
-    end
-    mplot.layout[:frame].fillcolor = _inspectdr_mapcolor(plt[:background_color_outside])
-
    resize!(mplot.subplots, length(plt.subplots))
    nsubplots = length(plt.subplots)
    for (i, sp) in enumerate(plt.subplots)
@@ -418,28 +385,30 @@ function _before_layout_calcs(plt::Plot{InspectDRBackend})
            mplot.subplots[i] = InspectDR.Plot2D()
        end
        sp.o = mplot.subplots[i]
-        plot = sp.o
        _initialize_subplot(plt, sp)
        _inspectdr_setupsubplot(sp)

+            sp.o.layout.frame.fillcolor =
+                _inspectdr_mapcolor(plt[:background_color_outside])
+
        # add the annotations
        for ann in sp[:annotations]
-            _inspectdr_add_annotations(plot, ann...)
+            _inspectdr_add_annotations(mplot.subplots[i], ann...)
        end
    end

    #Do not yet support absolute plot positionning.
    #Just try to make things look more-or less ok:
    if nsubplots <= 1
-        mplot.layout[:ncolumns] = 1
+        mplot.ncolumns = 1
    elseif nsubplots <= 4
-        mplot.layout[:ncolumns] = 2
+        mplot.ncolumns = 2
    elseif nsubplots <= 6
-        mplot.layout[:ncolumns] = 3
+        mplot.ncolumns = 3
    elseif nsubplots <= 12
-        mplot.layout[:ncolumns] = 4
+        mplot.ncolumns = 4
    else
-        mplot.layout[:ncolumns] = 5
+        mplot.ncolumns = 5
    end

    for series in plt.series_list
@@ -453,19 +422,8 @@ 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{InspectDRBackend})
-    plot = sp.o
-    if !isa(plot, InspectDR.Plot2D); return sp.minpad; end
-    #Computing plotbounds with 0-BoundingBox returns required padding:
-    bb = InspectDR.plotbounds(plot.layout.values, InspectDR.BoundingBox(0,0,0,0))
-    #NOTE: plotbounds always pads for titles, legends, etc. even if not in use.
-    #TODO: possibly zero-out items not in use??
-
-    # add in the user-specified margin to InspectDR padding:
-    leftpad   = abs(bb.xmin)*px + sp[:left_margin]
-    toppad    = abs(bb.ymin)*px + sp[:top_margin]
-    rightpad  = abs(bb.xmax)*px + sp[:right_margin]
-    bottompad = abs(bb.ymax)*px + sp[:bottom_margin]
-    sp.minpad = (leftpad, toppad, rightpad, bottompad)
+    sp.minpad = (20mm, 5mm, 2mm, 10mm)
+    #TODO: Add support for padding.
 end

 # ----------------------------------------------------------------
@@ -474,13 +432,6 @@ end
 function _update_plot_object(plt::Plot{InspectDRBackend})
    mplot = _inspectdr_getmplot(plt.o)
    if nothing == mplot; return; end
-
-    for (i, sp) in enumerate(plt.subplots)
-        graphbb = _inspectdr_to_pixels(plotarea(sp))
-        plot = mplot.subplots[i]
-        plot.plotbb = InspectDR.plotbounds(plot.layout.values, graphbb)
-    end
-
    gplot = _inspectdr_getgui(plt.o)
    if nothing == gplot; return; end

@@ -501,21 +452,19 @@ const _inspectdr_mimeformats_nodpi = Dict(
 #    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
    "application/pdf"         => "pdf"
 )
-_inspectdr_show(io::IO, mime::MIME, ::Void, w, h) =
+_inspectdr_show(io::IO, mime::MIME, ::Void) =
    throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
-function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
-    InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
-end
+_inspectdr_show(io::IO, mime::MIME, mplot) = show(io, mime, mplot)

 for (mime, fmt) in _inspectdr_mimeformats_dpi
    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
        dpi = plt[:dpi]#TODO: support
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o))
    end
 end
 for (mime, fmt) in _inspectdr_mimeformats_nodpi
    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
+        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o))
    end
 end
 _show(io::IO, mime::MIME"text/plain", plt::Plot{InspectDRBackend}) = nothing #Don't show
@@ -2,12 +2,8 @@

 # significant contributions by: @pkofod

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "pgfplots.jl"))
-end
-
 const _pgfplots_attr = merge_with_base_supported([
-    :annotations,
+    # :annotations,
    # :background_color_legend,
    :background_color_inside,
    # :background_color_outside,
@@ -26,22 +22,19 @@ const _pgfplots_attr = merge_with_base_supported([
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
    :grid, :legend,
-    :colorbar,
-    :marker_z, #:levels,
+    # :colorbar,
+    # :marker_z, :levels,
    # :ribbon, :quiver, :arrow,
    # :orientation,
    # :overwrite_figure,
-    :polar,
+    # :polar,
    # :normalize, :weights, :contours,
    :aspect_ratio,
    # :match_dimensions,
-    :tick_direction,
-    :framestyle,
-    :camera,
  ])
-const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape]
+const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour]
 const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
-const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline] #vcat(_allMarkers, Shape)
+const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon] #vcat(_allMarkers, Shape)
 const _pgfplots_scale = [:identity, :ln, :log2, :log10]


@@ -86,7 +79,6 @@ const _pgfplots_markers = KW(
    :star6 => "asterisk",
    :diamond => "diamond*",
    :pentagon => "pentagon*",
-    :hline => "-"
 )

 const _pgfplots_legend_pos = KW(
@@ -94,7 +86,6 @@ const _pgfplots_legend_pos = KW(
    :bottomright => "south east",
    :topright => "north east",
    :topleft => "north west",
-    :outertopright => "outer north east",
 )


@@ -107,47 +98,14 @@ const _pgf_series_extrastyle = KW(
    :xsticks => "xcomb",
 )

-# PGFPlots uses the anchors to define orientations for example to align left
-# one needs to use the right edge as anchor
-const _pgf_annotation_halign = KW(
-    :center => "",
-    :left => "right",
-    :right => "left"
-)
-
-const _pgf_framestyles = [:box, :axes, :origin, :zerolines, :grid, :none]
-const _pgf_framestyle_defaults = Dict(:semi => :box)
-function pgf_framestyle(style::Symbol)
-    if style in _pgf_framestyles
-        return style
-    else
-        default_style = get(_pgf_framestyle_defaults, style, :axes)
-        warn("Framestyle :$style is not (yet) supported by the PGFPlots backend. :$default_style was cosen instead.")
-        default_style
-    end
-end
-
 # --------------------------------------------------------------------------------------

 # takes in color,alpha, and returns color and alpha appropriate for pgf style
-function pgf_color(c::Colorant)
+function pgf_color(c)
    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", red(c), green(c), blue(c))
    cstr, alpha(c)
 end

-function pgf_color(grad::ColorGradient)
-    # Can't handle ColorGradient here, fallback to defaults.
-    cstr = @sprintf("{rgb,1:red,%.8f;green,%.8f;blue,%.8f}", 0.0, 0.60560316,0.97868012)
-    cstr, 1
-end
-
-# Generates a colormap for pgfplots based on a ColorGradient
-function pgf_colormap(grad::ColorGradient)
-    join(map(grad.colors) do c
-        @sprintf("rgb=(%.8f,%.8f,%.8f)", red(c), green(c),blue(c))
-    end,", ")
-end
-
 function pgf_fillstyle(d::KW)
    cstr,a = pgf_color(d[:fillcolor])
    "fill = $cstr, fill opacity=$a"
@@ -178,19 +136,6 @@ function pgf_marker(d::KW)
    }"""
 end

-function pgf_add_annotation!(o,x,y,val)
-    # Construct the style string.
-    # Currently supports color and orientation
-    cstr,a = pgf_color(val.font.color)
-    push!(o, PGFPlots.Plots.Node(val.str, # Annotation Text
-                                 x, y,
-                                 style="""
-                                 $(get(_pgf_annotation_halign,val.font.halign,"")),
-                                 color=$cstr, draw opacity=$(convert(Float16,a)),
-                                 rotate=$(val.font.rotation)
-                                 """))
-end
-
 # --------------------------------------------------------------------------------------

 function pgf_series(sp::Subplot, series::Series)
@@ -198,19 +143,17 @@ function pgf_series(sp::Subplot, series::Series)
    st = d[:seriestype]
    style = []
    kw = KW()
+
    push!(style, pgf_linestyle(d))
    push!(style, pgf_marker(d))

-    if d[:fillrange] != nothing || st in (:shape,)
+    if d[:fillrange] != nothing
        push!(style, pgf_fillstyle(d))
    end

    # add to legend?
    if sp[:legend] != :none && should_add_to_legend(series)
        kw[:legendentry] = d[:label]
-        if st == :shape || d[:fillrange] != nothing
-            push!(style, "area legend")
-        end
    else
        push!(style, "forget plot")
    end
@@ -220,13 +163,6 @@ function pgf_series(sp::Subplot, series::Series)
        d[:z].surf, d[:x], d[:y]
    elseif is3d(st)
        d[:x], d[:y], d[:z]
-    elseif d[:marker_z] != nothing
-        # If a marker_z is used pass it as third coordinate to a 2D plot.
-        # See "Scatter Plots" in PGFPlots documentation
-        d[:x], d[:y], d[:marker_z]
-    elseif ispolar(sp)
-        theta, r = filter_radial_data(d[:x], d[:y], axis_limits(sp[:yaxis]))
-        rad2deg.(theta), r
    else
        d[:x], d[:y]
    end
@@ -272,15 +208,9 @@ function pgf_axis(sp::Subplot, letter)
    style = []
    kw = KW()

-    # set to supported framestyle
-    framestyle = pgf_framestyle(sp[:framestyle])
-
    # axis guide
    kw[Symbol(letter,:label)] = axis[:guide]

-    # Add ticklabel rotations
-    push!(style, "$(letter)ticklabel style={rotate = $(axis[:rotation])}")
-
    # flip/reverse?
    axis[:flip] && push!(style, "$letter dir=reverse")

@@ -292,65 +222,22 @@ function pgf_axis(sp::Subplot, letter)
    end

    # ticks on or off
-    if axis[:ticks] in (nothing, false) || framestyle == :none
+    if axis[:ticks] in (nothing, false)
        push!(style, "$(letter)majorticks=false")
    end

-    # grid on or off
-    if axis[:grid] && framestyle != :none
-        push!(style, "$(letter)majorgrids = true")
-    else
-        push!(style, "$(letter)majorgrids = false")
-    end
-
    # limits
    # TODO: support zlims
    if letter != :z
-        lims = ispolar(sp) && letter == :x ? rad2deg.(axis_limits(axis)) : axis_limits(axis)
+        lims = axis_limits(axis)
        kw[Symbol(letter,:min)] = lims[1]
        kw[Symbol(letter,:max)] = lims[2]
    end

-    if !(axis[:ticks] in (nothing, false, :none)) && framestyle != :none
+    if !(axis[:ticks] in (nothing, false, :none, :auto))
        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,","), "}"))
-        if axis[:showaxis] && axis[:scale] in (:ln, :log2, :log10) && axis[:ticks] == :auto
-            # wrap the power part of label with }
-            tick_labels = String[begin
-                base, power = split(label, "^")
-                power = string("{", power, "}")
-                string(base, "^", power)
-            end for label in ticks[2]]
-            push!(style, string(letter, "ticklabels = {\$", join(tick_labels,"\$,\$"), "\$}"))
-        elseif axis[:showaxis]
-            tick_labels = ispolar(sp) && letter == :x ? [ticks[2][3:end]..., "0", "45"] : ticks[2]
-            push!(style, string(letter, "ticklabels = {", join(tick_labels,","), "}"))
-        else
-            push!(style, string(letter, "ticklabels = {}"))
-        end
-        push!(style, string(letter, "tick align = ", (axis[:tick_direction] == :out ? "outside" : "inside")))
-    end
-
-    # framestyle
-    if framestyle in (:axes, :origin)
-        axispos = framestyle == :axes ? "left" : "middle"
-        # the * after lines disables the arrows at the axes
-        push!(style, string("axis lines* = ", axispos))
-    end
-
-    if framestyle == :zerolines
-        push!(style, string("extra ", letter, " ticks = 0"))
-        push!(style, string("extra ", letter, " tick labels = "))
-        push!(style, string("extra ", letter, " tick style = {grid = major, major grid style = {color = black, draw opacity=1.0, line width=0.5), solid}}"))
-    end
-
-    if !axis[:showaxis]
-        push!(style, "separate axis lines")
-    end
-    if !axis[:showaxis] || framestyle in (:zerolines, :grid, :none)
-        push!(style, string(letter, " axis line style = {draw opacity = 0}"))
+        push!(style, string(letter, "tick = {", join(ticks[1],","), "}"))
+        push!(style, string(letter, "ticklabels = {", join(ticks[2],","), "}"))
    end

    # return the style list and KW args
@@ -362,12 +249,8 @@ end

 function _update_plot_object(plt::Plot{PGFPlotsBackend})
    plt.o = PGFPlots.Axis[]
-    # Obtain the total height of the plot by extracting the maximal bottom
-    # coordinate from the bounding box.
-    total_height = bottom(bbox(plt.layout))
-
    for sp in plt.subplots
-       # first build the PGFPlots.Axis object
+        # first build the PGFPlots.Axis object
        style = ["unbounded coords=jump"]
        kw = KW()

@@ -382,12 +265,10 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})

        # bounding box values are in mm
        # note: bb origin is top-left, pgf is bottom-left
-        # A round on 2 decimal places should be enough precision for 300 dpi
-        # plots.
        bb = bbox(sp)
        push!(style, """
            xshift = $(left(bb).value)mm,
-            yshift = $(round((total_height - (bottom(bb))).value,2))mm,
+            yshift = $((height(bb) - (bottom(bb))).value)mm,
            axis background/.style={fill=$(pgf_color(sp[:background_color_inside])[1])}
        """)
        kw[:width] = "$(width(bb).value)mm"
@@ -397,6 +278,7 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            kw[:title] = "$(sp[:title])"
        end

+        sp[:grid] && push!(style, "grid = major")
        if sp[:aspect_ratio] in (1, :equal)
            kw[:axisEqual] = "true"
        end
@@ -406,70 +288,19 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            kw[:legendPos] = _pgfplots_legend_pos[legpos]
        end

-        if is3d(sp)
-            azim, elev = sp[:camera]
-            kw[:view] = "{$(azim)}{$(elev)}"
-        end
-
-        axisf = PGFPlots.Axis
-        if sp[:projection] == :polar
-            axisf = PGFPlots.PolarAxis
-            #make radial axis vertical
-            kw[:xmin] = 90
-            kw[:xmax] = 450
-        end
-
-        # Search series for any gradient. In case one series uses a gradient set
-        # the colorbar and colomap.
-        # The reasoning behind doing this on the axis level is that pgfplots
-        # colorbar seems to only works on axis level and needs the proper colormap for
-        # correctly displaying it.
-        # It's also possible to assign the colormap to the series itself but
-        # then the colormap needs to be added twice, once for the axis and once for the
-        # series.
-        # As it is likely that all series within the same axis use the same
-        # colormap this should not cause any problem.
-        for series in series_list(sp)
-            for col in (:markercolor, :fillcolor)
-                if typeof(series.d[col]) == ColorGradient
-                    push!(style,"colormap={plots}{$(pgf_colormap(series.d[col]))}")
-
-                    if sp[:colorbar] == :none
-                        kw[:colorbar] = "false"
-                    else
-                        kw[:colorbar] = "true"
-                    end
-                    # goto is needed to break out of col and series for
-                    @goto colorbar_end
-                end
-            end
-        end
-        @label colorbar_end
-
-        o = axisf(; style = style, kw...)
+        o = PGFPlots.Axis(; style = style, kw...)

        # add the series object to the PGFPlots.Axis
        for series in series_list(sp)
            push!(o, pgf_series(sp, series))
-
-            # add series annotations
-            anns = series[:series_annotations]
-            for (xi,yi,str,fnt) in EachAnn(anns, series[:x], series[:y])
-                pgf_add_annotation!(o, xi, yi, PlotText(str, fnt))
-            end
        end

-        # add the annotations
-        for ann in sp[:annotations]
-            pgf_add_annotation!(o,ann...)
-        end
-
-
        # add the PGFPlots.Axis to the list
        push!(plt.o, o)
    end
 end

+
 function _show(io::IO, mime::MIME"image/svg+xml", plt::Plot{PGFPlotsBackend})
    show(io, mime, plt.o)
 end
@@ -1,15 +1,11 @@

 # https://plot.ly/javascript/getting-started

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotly.jl"))
-end
-
 const _plotly_attr = merge_with_base_supported([
    :annotations,
    :background_color_legend, :background_color_inside, :background_color_outside,
    :foreground_color_legend, :foreground_color_guide,
-    :foreground_color_grid, :foreground_color_axis,
+    # :foreground_color_grid, :foreground_color_axis,
    :foreground_color_text, :foreground_color_border,
    :foreground_color_title,
    :label,
@@ -19,17 +15,11 @@ const _plotly_attr = merge_with_base_supported([
    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokestyle,
    :fillrange, :fillcolor, :fillalpha,
    :bins,
-    :title, :title_location,
-    :titlefontfamily, :titlefontsize, :titlefonthalign, :titlefontvalign,
-    :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
+    :title, :title_location, :titlefont,
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
-    :grid, :gridalpha, :gridlinewidth,
-    :legend, :colorbar, :colorbar_title,
+    :grid, :legend, :colorbar,
    :marker_z, :fill_z, :levels,
    :ribbon, :quiver,
    :orientation,
@@ -41,10 +31,6 @@ const _plotly_attr = merge_with_base_supported([
    :hover,
    :inset_subplots,
    :bar_width,
-    :clims,
-    :framestyle,
-    :tick_direction,
-    :camera,
  ])

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


 # --------------------------------------------------------------------------------------
@@ -131,7 +106,7 @@ const _plotly_legend_pos = KW(
    )

 plotly_legend_pos(pos::Symbol) = get(_plotly_legend_pos, pos, [1.,1.])
-plotly_legend_pos(v::Tuple{S,T}) where {S<:Real, T<:Real} = v
+plotly_legend_pos{S<:Real, T<:Real}(v::Tuple{S,T}) = v

 function plotly_font(font::Font, color = font.color)
    KW(
@@ -235,20 +210,11 @@ end

 function plotly_axis(axis::Axis, sp::Subplot)
    letter = axis[:letter]
-    framestyle = sp[:framestyle]
    ax = KW(
-        :visible    => framestyle != :none,
        :title      => axis[:guide],
-        :showgrid   => axis[:grid],
-        :gridcolor  => rgba_string(plot_color(axis[:foreground_color_grid], axis[:gridalpha])),
-        :gridwidth  => axis[:gridlinewidth],
-        :zeroline   => framestyle == :zerolines,
-        :zerolinecolor => rgba_string(axis[:foreground_color_axis]),
-        :showline   => framestyle in (:box, :axes) && axis[:showaxis],
-        :linecolor  => rgba_string(plot_color(axis[:foreground_color_axis])),
-        :ticks      => axis[:tick_direction] == :out ? "outside" : "inside",
-        :mirror     => framestyle == :box,
-        :showticklabels => axis[:showaxis],
+        :showgrid   => sp[:grid],
+        :zeroline   => false,
+        :ticks      => "inside",
    )

    if letter in (:x,:y)
@@ -257,15 +223,19 @@ function plotly_axis(axis::Axis, sp::Subplot)
    end

    ax[:tickangle] = -axis[:rotation]
-    lims = axis_limits(axis)
-    ax[:range] = map(scalefunc(axis[:scale]), lims)
-    
+
    if !(axis[:ticks] in (nothing, :none))
-        ax[:titlefont] = plotly_font(guidefont(axis))
+        ax[:titlefont] = plotly_font(axis[:guidefont], axis[:foreground_color_guide])
        ax[:type] = plotly_scale(axis[:scale])
-        ax[:tickfont] = plotly_font(tickfont(axis))
-        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])
+        ax[:tickfont] = plotly_font(axis[:tickfont], axis[:foreground_color_text])
+        ax[:tickcolor] = rgba_string(axis[:foreground_color_border])
+        ax[:linecolor] = rgba_string(axis[:foreground_color_border])
+
+        # lims
+        lims = axis[:lims]
+        if lims != :auto && limsType(lims) == :limits
+            ax[:range] = map(scalefunc(axis[:scale]), lims)
+        end

        # flip
        if axis[:flip]
@@ -289,23 +259,6 @@ function plotly_axis(axis::Axis, sp::Subplot)
        ax[:showgrid] = false
    end

-    
-    ax
-end
-
-function plotly_polaraxis(axis::Axis)
-    ax = KW(
-        :visible => axis[:showaxis],
-        :showline => axis[:grid],
-    )
-
-    if axis[:letter] == :x
-        ax[:range] = rad2deg.(axis_limits(axis))
-    else
-        ax[:range] = axis_limits(axis)
-        ax[:orientation] = -90
-    end
-
    ax
 end

@@ -315,7 +268,7 @@ function plotly_layout(plt::Plot)
    w, h = plt[:size]
    d_out[:width], d_out[:height] = w, h
    d_out[:paper_bgcolor] = rgba_string(plt[:background_color_outside])
-    d_out[:margin] = KW(:l=>0, :b=>20, :r=>0, :t=>20)
+    d_out[:margin] = KW(:l=>0, :b=>0, :r=>0, :t=>20)

    d_out[:annotations] = KW[]

@@ -336,36 +289,19 @@ function plotly_layout(plt::Plot)
                0.5 * (left(bb) + right(bb))
            end
            titlex, titley = xy_mm_to_pcts(xmm, top(bbox(sp)), w*px, h*px)
-            title_font = font(titlefont(sp), :top)
-            push!(d_out[:annotations], plotly_annotation_dict(titlex, titley, text(sp[:title], title_font)))
+            titlefont = font(sp[:titlefont], :top, sp[:foreground_color_title])
+            push!(d_out[:annotations], plotly_annotation_dict(titlex, titley, text(sp[:title], titlefont)))
        end

        d_out[:plot_bgcolor] = rgba_string(sp[:background_color_inside])

-        # set to supported framestyle
-        sp[:framestyle] = _plotly_framestyle(sp[:framestyle])
-
        # 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
            d_out[:scene] = KW(
                Symbol("xaxis$spidx") => plotly_axis(sp[:xaxis], sp),
                Symbol("yaxis$spidx") => plotly_axis(sp[:yaxis], sp),
                Symbol("zaxis$spidx") => plotly_axis(sp[:zaxis], sp),
-
-                #2.6 multiplier set camera eye such that whole plot can be seen
-                :camera => KW(
-                    :eye => KW(
-                        :x => cosd(azim)*sind(theta)*2.6,
-                        :y => sind(azim)*sind(theta)*2.6,
-                        :z => cosd(theta)*2.6,
-                    ),
-                ),
            )
-        elseif ispolar(sp)
-            d_out[Symbol("angularaxis$spidx")] = plotly_polaraxis(sp[:xaxis])
-            d_out[Symbol("radialaxis$spidx")] = plotly_polaraxis(sp[:yaxis])
        else
            d_out[Symbol("xaxis$spidx")] = plotly_axis(sp[:xaxis], sp)
            d_out[Symbol("yaxis$spidx")] = plotly_axis(sp[:yaxis], sp)
@@ -378,7 +314,7 @@ function plotly_layout(plt::Plot)
            d_out[:legend] = KW(
                :bgcolor  => rgba_string(sp[:background_color_legend]),
                :bordercolor => rgba_string(sp[:foreground_color_legend]),
-                :font     => plotly_font(legendfont(sp)),
+                :font     => plotly_font(sp[:legendfont], sp[:foreground_color_legend]),
                :x => xpos,
                :y => ypos
            )
@@ -466,16 +402,12 @@ end

 plotly_data(v) = collect(v)
 plotly_data(surf::Surface) = surf.surf
-plotly_data(v::AbstractArray{R}) where {R<:Rational} = float(v)
+plotly_data{R<:Rational}(v::AbstractArray{R}) = float(v)

 plotly_surface_data(series::Series, a::AbstractVector) = a
 plotly_surface_data(series::Series, a::AbstractMatrix) = transpose_z(series, a, false)
 plotly_surface_data(series::Series, a::Surface) = plotly_surface_data(series, a.surf)

-#ensures that a gradient is called if a single color is supplied where a gradient is needed (e.g. if a series recipe defines marker_z)
-as_gradient(grad::ColorGradient, α) = grad
-as_gradient(grad, α) = cgrad(alpha = α)
-
 # get a dictionary representing the series params (d is the Plots-dict, d_out is the Plotly-dict)
 function plotly_series(plt::Plot, series::Series)
    st = series[:seriestype]
@@ -498,8 +430,6 @@ function plotly_series(plt::Plot, series::Series)
    isscatter = st in (:scatter, :scatter3d, :scattergl)
    hasmarker = isscatter || series[:markershape] != :none
    hasline = st in (:path, :path3d)
-    hasfillrange = st in (:path, :scatter, :scattergl) &&
-        (isa(series[:fillrange], AbstractVector) || isa(series[:fillrange], Tuple))

    # for surface types, set the data
    if st in (:heatmap, :contour, :surface, :wireframe)
@@ -508,13 +438,6 @@ function plotly_series(plt::Plot, series::Series)
        end
    end

-    d_out[:colorbar] = KW(:title => sp[:colorbar_title])
-
-    clims = sp[:clims]
-    if is_2tuple(clims)
-        d_out[:zmin], d_out[:zmax] = clims
-    end
-
    # set the "type"
    if st in (:path, :scatter, :scattergl)
        d_out[:type] = st==:scattergl ? "scattergl" : "scatter"
@@ -523,14 +446,11 @@ function plotly_series(plt::Plot, series::Series)
        else
            hasline ? "lines" : "none"
        end
-        if series[:fillrange] == true || series[:fillrange] == 0 || isa(series[:fillrange], Tuple)
+        if series[:fillrange] == true || series[:fillrange] == 0
            d_out[:fill] = "tozeroy"
            d_out[:fillcolor] = rgba_string(series[:fillcolor])
-        elseif isa(series[:fillrange], AbstractVector)
-            d_out[:fill] = "tonexty"
-            d_out[:fillcolor] = rgba_string(series[:fillcolor])
        elseif !(series[:fillrange] in (false, nothing))
-            warn("fillrange ignored... plotly only supports filling to zero and to a vector of values. fillrange: $(series[:fillrange])")
+            warn("fillrange ignored... plotly only supports filling to zero. fillrange: $(series[:fillrange])")
        end
        d_out[:x], d_out[:y] = x, y

@@ -541,15 +461,12 @@ function plotly_series(plt::Plot, series::Series)
        else
            y, x, "h"
        end
-        d_out[:width] = series[:bar_width]
-        d_out[:marker] = KW(:color => rgba_string(series[:fillcolor]),
-                            :width => series[:strokewidth])
+        d_out[:marker] = KW(:color => rgba_string(series[:fillcolor]))

    elseif st == :heatmap
        d_out[:type] = "heatmap"
        # d_out[:x], d_out[:y], d_out[:z] = series[:x], series[:y], transpose_z(series, series[:z].surf, false)
        d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
-        d_out[:showscale] = hascolorbar(sp)

    elseif st == :contour
        d_out[:type] = "contour"
@@ -558,7 +475,6 @@ function plotly_series(plt::Plot, series::Series)
        d_out[:ncontours] = series[:levels]
        d_out[:contours] = KW(:coloring => series[:fillrange] != nothing ? "fill" : "lines")
        d_out[:colorscale] = plotly_colorscale(series[:linecolor], series[:linealpha])
-        d_out[:showscale] = hascolorbar(sp)

    elseif st in (:surface, :wireframe)
        d_out[:type] = "surface"
@@ -571,14 +487,11 @@ function plotly_series(plt::Plot, series::Series)
                :highlightwidth => series[:linewidth],
            )
            d_out[:contours] = KW(:x => wirelines, :y => wirelines, :z => wirelines)
-            d_out[:showscale] = false
        else
            d_out[:colorscale] = plotly_colorscale(series[:fillcolor], series[:fillalpha])
-            d_out[:opacity] = series[:fillalpha]
            if series[:fill_z] != nothing
                d_out[:surfacecolor] = plotly_surface_data(series, series[:fill_z])
            end
-            d_out[:showscale] = hascolorbar(sp)
        end

    elseif st == :pie
@@ -616,18 +529,13 @@ function plotly_series(plt::Plot, series::Series)
        )

        # gotta hack this (for now?) since plotly can't handle rgba values inside the gradient
-        if series[:marker_z] == nothing
-            d_out[:marker][:color] = rgba_string(series[:markercolor])
+        d_out[:marker][:color] = if series[:marker_z] == nothing
+            rgba_string(series[:markercolor])
        else
            # grad = ColorGradient(series[:markercolor], alpha=series[:markeralpha])
-            # grad = as_gradient(series[:markercolor], series[:markeralpha])
-            cmin, cmax = get_clims(sp)
-            # 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)
-            d_out[:marker][:color] = [clamp(zi, cmin, cmax) for zi in series[:marker_z]]
-            d_out[:marker][:cmin] = cmin
-            d_out[:marker][:cmax] = cmax
-            d_out[:marker][:colorscale] = plotly_colorscale(series[:markercolor], series[:markeralpha])
-            d_out[:marker][:showscale] = hascolorbar(sp)
+            grad = series[:markercolor]
+            zmin, zmax = extrema(series[:marker_z])
+            [rgba_string(grad[(zi - zmin) / (zmax - zmin)]) for zi in series[:marker_z]]
        end
    end

@@ -651,29 +559,7 @@ function plotly_series(plt::Plot, series::Series)
    plotly_polar!(d_out, series)
    plotly_hover!(d_out, series[:hover])

-    if hasfillrange
-        # if hasfillrange is true, return two dictionaries (one for original
-        # series, one for series being filled to) instead of one
-        d_out_fillrange = deepcopy(d_out)
-        d_out_fillrange[:showlegend] = false
-        if isa(series[:fillrange], AbstractVector)
-            d_out_fillrange[:y] = series[:fillrange]
-            delete!(d_out_fillrange, :fill)
-            delete!(d_out_fillrange, :fillcolor)
-        else
-            # if fillrange is a tuple with upper and lower limit, d_out_fillrange
-            # is the series that will do the filling
-            d_out_fillrange[:x], d_out_fillrange[:y] =
-                concatenate_fillrange(series[:x], series[:fillrange])
-            d_out_fillrange[:line][:width] = 0
-            delete!(d_out, :fill)
-            delete!(d_out, :fillcolor)
-        end
-
-        return [d_out_fillrange, d_out]
-    else
-        return [d_out]
-    end
+    [d_out]
 end

 function plotly_series_shapes(plt::Plot, series::Series)
@@ -701,18 +587,18 @@ function plotly_series_shapes(plt::Plot, series::Series)
            :x => vcat(x[rng], x[rng[1]]),
            :y => vcat(y[rng], y[rng[1]]),
            :fill => "tozeroy",
-            :fillcolor => rgba_string(_cycle(series[:fillcolor], i)),
+            :fillcolor => rgba_string(cycle(series[:fillcolor], i)),
        ))
        if series[:markerstrokewidth] > 0
            d_out[:line] = KW(
-                :color => rgba_string(_cycle(series[:linecolor], i)),
+                :color => rgba_string(cycle(series[:linecolor], i)),
                :width => series[:linewidth],
                :dash => string(series[:linestyle]),
            )
        end
        d_out[:showlegend] = i==1 ? should_add_to_legend(series) : false
        plotly_polar!(d_out, series)
-        plotly_hover!(d_out, _cycle(series[:hover], i))
+        plotly_hover!(d_out, cycle(series[:hover], i))
        push!(d_outs, d_out)
    end
    d_outs
@@ -721,9 +607,8 @@ end
 function plotly_polar!(d_out::KW, series::Series)
    # convert polar plots x/y to theta/radius
    if ispolar(series[:subplot])
-        theta, r = filter_radial_data(pop!(d_out, :x), pop!(d_out, :y), axis_limits(series[:subplot][:yaxis]))
-        d_out[:t] = rad2deg.(theta)
-        d_out[:r] = r
+        d_out[:t] = rad2deg(pop!(d_out, :x))
+        d_out[:r] = pop!(d_out, :y)
    end
 end

@@ -752,7 +637,7 @@ end
 const _use_remote = Ref(false)

 function html_head(plt::Plot{PlotlyBackend})
-    jsfilename = _use_remote[] ? _plotly_js_path_remote : ("file://" * _plotly_js_path)
+    jsfilename = _use_remote[] ? _plotly_js_path_remote : _plotly_js_path
    # "<script src=\"$(joinpath(dirname(@__FILE__),"..","..","deps","plotly-latest.min.js"))\"></script>"
    "<script src=\"$jsfilename\"></script>"
 end
@@ -1,6 +1,3 @@
-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "plotlyjs.jl")) 
-end

 # https://github.com/spencerlyon2/PlotlyJS.jl

@@ -88,8 +85,7 @@ end

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

-function Base.show(io::IO, ::MIME"text/html", plt::Plot{PlotlyJSBackend})
-    prepare_output(plt)
+function _show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend})
    if isijulia() && !_use_remote[]
        write(io, PlotlyJS.html_body(PlotlyJS.JupyterPlot(plt.o)))
    else
@@ -102,23 +98,12 @@ function plotlyjs_save_hack(io::IO, plt::Plot{PlotlyJSBackend}, ext::String)
    PlotlyJS.savefig(plt.o, tmpfn)
    write(io, read(open(tmpfn)))
 end
-_show(io::IO, ::MIME"image/svg+xml", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "svg")
 _show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "png")
 _show(io::IO, ::MIME"application/pdf", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "pdf")
 _show(io::IO, ::MIME"image/eps", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hack(io, plt, "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
+    display(plt.o)
 end


@@ -1,9 +1,6 @@

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

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "pyplot.jl"))
-end

 const _pyplot_attr = merge_with_base_supported([
    :annotations,
@@ -19,12 +16,8 @@ const _pyplot_attr = merge_with_base_supported([
    :title, :title_location, :titlefont,
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
-    :titlefontfamily, :titlefontsize, :titlefontcolor,
-    :legendfontfamily, :legendfontsize, :legendfontcolor,
-    :tickfontfamily, :tickfontsize, :tickfontcolor,
-    :guidefontfamily, :guidefontsize, :guidefontcolor,
-    :grid, :gridalpha, :gridstyle, :gridlinewidth,
-    :legend, :legendtitle, :colorbar,
+    :tickfont, :guidefont, :legendfont,
+    :grid, :legend, :colorbar,
    :marker_z, :line_z, :fill_z,
    :levels,
    :ribbon, :quiver, :arrow,
@@ -38,10 +31,6 @@ const _pyplot_attr = merge_with_base_supported([
    :inset_subplots,
    :dpi,
    :colorbar_title,
-    :stride,
-    :framestyle,
-    :tick_direction,
-    :camera,
  ])
 const _pyplot_seriestype = [
        :path, :steppre, :steppost, :shape,
@@ -66,8 +55,6 @@ function add_backend_string(::PyPlotBackend)
    withenv("PYTHON" => "") do
        Pkg.build("PyPlot")
    end
-
-    # now restart julia!
    """
 end

@@ -81,30 +68,22 @@ function _initialize_backend(::PyPlotBackend)
        append!(Base.Multimedia.displays, otherdisplays)

        export PyPlot
-        const pycolors = PyPlot.pyimport("matplotlib.colors")
-        const pypath = PyPlot.pyimport("matplotlib.path")
-        const mplot3d = PyPlot.pyimport("mpl_toolkits.mplot3d")
-        const pypatches = PyPlot.pyimport("matplotlib.patches")
-        const pyfont = PyPlot.pyimport("matplotlib.font_manager")
-        const pyticker = PyPlot.pyimport("matplotlib.ticker")
-        const pycmap = PyPlot.pyimport("matplotlib.cm")
-        const pynp = PyPlot.pyimport("numpy")
-        pynp["seterr"](invalid="ignore")
-        const pytransforms = PyPlot.pyimport("matplotlib.transforms")
-        const pycollections = PyPlot.pyimport("matplotlib.collections")
-        const pyart3d = PyPlot.pyimport("mpl_toolkits.mplot3d.art3d")
-
-        # "support" matplotlib v1.5
-        const set_facecolor_sym = if PyPlot.version < v"2"
-            warn("You are using Matplotlib $(PyPlot.version), which is no longer officialy supported by the Plots community. To ensure smooth Plots.jl integration update your Matplotlib library to a version >= 2.0.0")
-            :set_axis_bgcolor
-        else
-            :set_facecolor
-        end
-
-        # we don't want every command to update the figure
-        PyPlot.ioff()
+        const pycolors = PyPlot.pywrap(PyPlot.pyimport("matplotlib.colors"))
+        const pypath = PyPlot.pywrap(PyPlot.pyimport("matplotlib.path"))
+        const mplot3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d"))
+        const pypatches = PyPlot.pywrap(PyPlot.pyimport("matplotlib.patches"))
+        const pyfont = PyPlot.pywrap(PyPlot.pyimport("matplotlib.font_manager"))
+        const pyticker = PyPlot.pywrap(PyPlot.pyimport("matplotlib.ticker"))
+        const pycmap = PyPlot.pywrap(PyPlot.pyimport("matplotlib.cm"))
+        const pynp = PyPlot.pywrap(PyPlot.pyimport("numpy"))
+        pynp.seterr(invalid="ignore")
+        const pytransforms = PyPlot.pywrap(PyPlot.pyimport("matplotlib.transforms"))
+        const pycollections = PyPlot.pywrap(PyPlot.pyimport("matplotlib.collections"))
+        const pyart3d = PyPlot.pywrap(PyPlot.pyimport("mpl_toolkits.mplot3d.art3d"))
    end
+
+    # we don't want every command to update the figure
+    PyPlot.ioff()
 end

 # --------------------------------------------------------------------------------------
@@ -120,7 +99,7 @@ end

 # function py_colormap(c::ColorGradient, α=nothing)
 #     pyvals = [(v, py_color(getColorZ(c, v), α)) for v in c.values]
-#     pycolors["LinearSegmentedColormap"][:from_list]("tmp", pyvals)
+#     pycolors.pymember("LinearSegmentedColormap")[:from_list]("tmp", pyvals)
 # end

 # # convert vectors and ColorVectors to standard ColorGradients
@@ -131,14 +110,13 @@ end
 # # anything else just gets a bluesred gradient
 # py_colormap(c, α=nothing) = py_colormap(default_gradient(), α)

-py_color(s) = py_color(parse(Colorant, string(s)))
 py_color(c::Colorant) = (red(c), green(c), blue(c), alpha(c))
 py_color(cs::AVec) = map(py_color, cs)
 py_color(grad::ColorGradient) = py_color(grad.colors)

 function py_colormap(grad::ColorGradient)
    pyvals = [(z, py_color(grad[z])) for z in grad.values]
-    cm = pycolors["LinearSegmentedColormap"][:from_list]("tmp", pyvals)
+    cm = pycolors.LinearSegmentedColormap[:from_list]("tmp", pyvals)
    cm[:set_bad](color=(0,0,0,0.0), alpha=0.0)
    cm
 end
@@ -147,7 +125,7 @@ py_colormap(c) = py_colormap(cgrad())

 function py_shading(c, z)
    cmap = py_colormap(c)
-    ls = pycolors["LightSource"](270,45)
+    ls = pycolors.pymember("LightSource")(270,45)
    ls[:shade](z, cmap, vert_exag=0.1, blend_mode="soft")
 end

@@ -171,7 +149,7 @@ function py_marker(marker::Shape)
        mat[i,2] = y[i]
    end
    mat[n+1,:] = mat[1,:]
-    pypath["Path"](mat)
+    pypath.pymember("Path")(mat)
 end

 const _path_MOVETO = UInt8(1)
@@ -197,7 +175,7 @@ const _path_CLOSEPOLY = UInt8(79)
 #         lastnan = nan
 #     end
 #     codes[n+1] = _path_CLOSEPOLY
-#     pypath["Path"](mat, codes)
+#     pypath.pymember("Path")(mat, codes)
 # end

 # get the marker shape
@@ -239,22 +217,16 @@ function py_stepstyle(seriestype::Symbol)
    return "default"
 end

-function py_fillstepstyle(seriestype::Symbol)
-    seriestype == :steppost && return "post"
-    seriestype == :steppre && return "pre"
-    return nothing
-end
-
 # # untested... return a FontProperties object from a Plots.Font
 # function py_font(font::Font)
-#     pyfont["FontProperties"](
+#     pyfont.pymember("FontProperties")(
 #         family = font.family,
 #         size = font.size
 #     )
 # end

 function get_locator_and_formatter(vals::AVec)
-    pyticker["FixedLocator"](1:length(vals)), pyticker["FixedFormatter"](vals)
+    pyticker.pymember("FixedLocator")(1:length(vals)), pyticker.pymember("FixedFormatter")(vals)
 end

 function add_pyfixedformatter(cbar, vals::AVec)
@@ -276,9 +248,9 @@ function labelfunc(scale::Symbol, backend::PyPlotBackend)
 end

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

 # ---------------------------------------------------------------------------
@@ -453,16 +425,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
    xyargs = (st in _3dTypes ? (x,y,z) : (x,y))

    # handle zcolor and get c/cmap
-    needs_colorbar = hascolorbar(sp)
-    extrakw = if needs_colorbar || is_2tuple(sp[:clims])
-        vmin, vmax = get_clims(sp)
-        KW(:vmin => vmin, :vmax => vmax)
-    else
-        KW()
-    end
+    extrakw = KW()

    # holds references to any python object representing the matplotlib series
    handles = []
+    needs_colorbar = false
    discrete_colorbar_values = nothing


@@ -507,37 +474,43 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                    :zorder => plt.n,
                    :cmap => py_linecolormap(series),
                    :linewidth => py_dpi_scale(plt, series[:linewidth]),
-                    :linestyle => py_linestyle(st, series[:linestyle]),
-                    :norm => pycolors["Normalize"](; extrakw...)
+                    :linestyle => py_linestyle(st, series[:linestyle])
                )
-                lz = _cycle(series[:line_z], 1:n)
+                clims = sp[:clims]
+                if is_2tuple(clims)
+                    extrakw = KW()
+                    isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
+                    isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
+                    kw[:norm] = pycolors.Normalize(; extrakw...)
+                end
+                lz = collect(series[:line_z])
                handle = if is3d(st)
                    for rng in iter_segments(x, y, z)
                        length(rng) < 2 && continue
-                        for i in rng[1:end-1]
-                            push!(segments, [(_cycle(x,i),_cycle(y,i),_cycle(z,i)),
-                                             (_cycle(x,i+1),_cycle(y,i+1),_cycle(z,i+1))])
-                        end
+                        push!(segments, [(cycle(x,i),cycle(y,i),cycle(z,i)) for i in rng])
                    end
-
-                    lc = pyart3d["Line3DCollection"](segments; kw...)
+                    # for i=1:n
+                    #     segments[i] = [(cycle(x,i), cycle(y,i), cycle(z,i)), (cycle(x,i+1), cycle(y,i+1), cycle(z,i+1))]
+                    # end
+                    lc = pyart3d.Line3DCollection(segments; kw...)
                    lc[:set_array](lz)
                    ax[:add_collection3d](lc, zs=z) #, zdir='y')
                    lc
                else
                    for rng in iter_segments(x, y)
                        length(rng) < 2 && continue
-                        for i in rng[1:end-1]
-                            push!(segments, [(_cycle(x,i),_cycle(y,i)), (_cycle(x,i+1),_cycle(y,i+1))])
-                        end
+                        push!(segments, [(cycle(x,i),cycle(y,i)) for i in rng])
                    end
-
-                    lc = pycollections["LineCollection"](segments; kw...)
+                    # for i=1:n
+                    #     segments[i] = [(cycle(x,i), cycle(y,i)), (cycle(x,i+1), cycle(y,i+1))]
+                    # end
+                    lc = pycollections.LineCollection(segments; kw...)
                    lc[:set_array](lz)
                    ax[:add_collection](lc)
                    lc
                end
                push!(handles, handle)
+                needs_colorbar = true
            end

            a = series[:arrow]
@@ -571,11 +544,18 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
    if series[:markershape] != :none && st in (:path, :scatter, :path3d,
                                          :scatter3d, :steppre, :steppost,
                                          :bar)
+        extrakw = KW()
        if series[:marker_z] == nothing
            extrakw[:c] = py_color_fix(py_markercolor(series), x)
        else
            extrakw[:c] = convert(Vector{Float64}, series[:marker_z])
            extrakw[:cmap] = py_markercolormap(series)
+            clims = sp[:clims]
+            if is_2tuple(clims)
+                isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
+                isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
+            end
+            needs_colorbar = true
        end
        xyargs = if st == :bar && !isvertical(series)
            (y, x)
@@ -593,16 +573,16 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            lw = py_dpi_scale(plt, series[:markerstrokewidth])
            for i=1:length(y)
                extrakw[:c] = if series[:marker_z] == nothing
-                    py_color_fix(py_color(_cycle(series[:markercolor],i)), x)
+                    py_color_fix(py_color(cycle(series[:markercolor],i)), x)
                else
                    extrakw[:c]
                end

-                push!(handle, ax[:scatter](_cycle(x,i), _cycle(y,i);
+                push!(handle, ax[:scatter](cycle(x,i), cycle(y,i);
                    label = series[:label],
                    zorder = series[:series_plotindex] + 0.5,
-                    marker = py_marker(_cycle(shapes,i)),
-                    s =  py_dpi_scale(plt, _cycle(series[:markersize],i) .^ 2),
+                    marker = py_marker(cycle(shapes,i)),
+                    s =  py_dpi_scale(plt, cycle(series[:markersize],i) .^ 2),
                    edgecolors = msc,
                    linewidths = lw,
                    extrakw...
@@ -625,6 +605,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
    end

    if st == :hexbin
+        clims = sp[:clims]
+        if is_2tuple(clims)
+            isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
+            isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
+        end
        handle = ax[:hexbin](x, y;
            label = series[:label],
            zorder = series[:series_plotindex],
@@ -635,10 +620,18 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            extrakw...
        )
        push!(handles, handle)
+        needs_colorbar = true
    end

    if st in (:contour, :contour3d)
        z = transpose_z(series, z.surf)
+        needs_colorbar = true
+
+        clims = sp[:clims]
+        if is_2tuple(clims)
+            isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
+            isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
+        end

        if st == :contour3d
            extrakw[:extend3d] = true
@@ -683,12 +676,13 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                else
                    extrakw[:cmap] = py_fillcolormap(series)
                end
+                needs_colorbar = true
            end
            handle = ax[st == :surface ? :plot_surface : :plot_wireframe](x, y, z;
                label = series[:label],
                zorder = series[:series_plotindex],
-                rstride = series[:stride][1],
-                cstride = series[:stride][2],
+                rstride = 1,
+                cstride = 1,
                linewidth = py_dpi_scale(plt, series[:linewidth]),
                edgecolor = py_linecolor(series),
                extrakw...
@@ -698,16 +692,21 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            # contours on the axis planes
            if series[:contours]
                for (zdir,mat) in (("x",x), ("y",y), ("z",z))
-                    offset = (zdir == "y" ? ignorenan_maximum : ignorenan_minimum)(mat)
+                    offset = (zdir == "y" ? maximum : minimum)(mat)
                    handle = ax[:contourf](x, y, z, levelargs...;
                        zdir = zdir,
                        cmap = py_fillcolormap(series),
-                        offset = (zdir == "y" ? ignorenan_maximum : ignorenan_minimum)(mat)  # where to draw the contour plane
+                        offset = (zdir == "y" ? maximum : minimum)(mat)  # where to draw the contour plane
                    )
                    push!(handles, handle)
+                    needs_colorbar = true
                end
            end

+            # no colorbar if we are creating a surface LightSource
+            if haskey(extrakw, :facecolors)
+                needs_colorbar = false
+            end

        elseif typeof(z) <: AbstractVector
            # tri-surface plot (http://matplotlib.org/mpl_toolkits/mplot3d/tutorial.html#tri-surface-plots)
@@ -725,6 +724,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                extrakw...
            )
            push!(handles, handle)
+            needs_colorbar = true
        else
            error("Unsupported z type $(typeof(z)) for seriestype=$st")
        end
@@ -755,7 +755,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
    end

    if st == :heatmap
-        x, y, z = heatmap_edges(x, sp[:xaxis][:scale]), heatmap_edges(y, sp[:yaxis][:scale]), transpose_z(series, z.surf)
+        x, y, z = heatmap_edges(x), heatmap_edges(y), transpose_z(series, z.surf)

        expand_extrema!(sp[:xaxis], x)
        expand_extrema!(sp[:yaxis], y)
@@ -764,6 +764,11 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            discrete_colorbar_values = dvals
        end

+        clims = sp[:clims]
+        zmin, zmax = extrema(z)
+        extrakw[:vmin] = (is_2tuple(clims) && isfinite(clims[1])) ? clims[1] : zmin
+        extrakw[:vmax] = (is_2tuple(clims) && isfinite(clims[2])) ? clims[2] : zmax
+
        handle = ax[:pcolormesh](x, y, py_mask_nans(z);
            label = series[:label],
            zorder = series[:series_plotindex],
@@ -772,19 +777,20 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            extrakw...
        )
        push!(handles, handle)
+        needs_colorbar = true
    end

    if st == :shape
        handle = []
        for (i,rng) in enumerate(iter_segments(x, y))
            if length(rng) > 1
-                path = pypath["Path"](hcat(x[rng], y[rng]))
-                patches = pypatches["PathPatch"](
+                path = pypath.pymember("Path")(hcat(x[rng], y[rng]))
+                patches = pypatches.pymember("PathPatch")(
                    path;
                    label = series[:label],
                    zorder = series[:series_plotindex],
-                    edgecolor = py_color(_cycle(series[:linecolor], i)),
-                    facecolor = py_color(_cycle(series[:fillcolor], i)),
+                    edgecolor = py_color(cycle(series[:linecolor], i)),
+                    facecolor = py_color(cycle(series[:fillcolor], i)),
                    linewidth = py_dpi_scale(plt, series[:linewidth]),
                    fill = true
                )
@@ -814,6 +820,30 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
    # # smoothing
    # handleSmooth(plt, ax, series, series[:smooth])

+    # add the colorbar legend
+    if needs_colorbar && sp[:colorbar] != :none
+        # add keyword args for a discrete colorbar
+        handle = handles[end]
+        kw = KW()
+        if discrete_colorbar_values != nothing
+            locator, formatter = get_locator_and_formatter(discrete_colorbar_values)
+            # kw[:values] = 1:length(discrete_colorbar_values)
+            kw[:values] = sp[:zaxis][:continuous_values]
+            kw[:ticks] = locator
+            kw[:format] = formatter
+            kw[:boundaries] = vcat(0, kw[:values] + 0.5)
+        end
+
+        # create and store the colorbar object (handle) and the axis that it is drawn on.
+        # note: the colorbar axis is positioned independently from the subplot axis
+        fig = plt.o
+        cbax = fig[:add_axes]([0.8,0.1,0.03,0.8], label = string(gensym()))
+        cb = fig[:colorbar](handle; cax = cbax, kw...)
+        cb[:set_label](sp[:colorbar_title])
+        sp.attr[:cbar_handle] = cb
+        sp.attr[:cbar_ax] = cbax
+    end
+
    # handle area filling
    fillrange = series[:fillrange]
    if fillrange != nothing && st != :contour
@@ -829,7 +859,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
            dim1, expand_data(fillrange[1], n), expand_data(fillrange[2], n)
        end

-        handle = ax[f](args..., trues(n), false, py_fillstepstyle(st);
+        handle = ax[f](args...;
            zorder = series[:series_plotindex],
            facecolor = py_fillcolor(series),
            linewidths = 0
@@ -883,14 +913,14 @@ function py_compute_axis_minval(axis::Axis)
        for series in series_list(sp)
            v = series.d[axis[:letter]]
            if !isempty(v)
-                minval = NaNMath.min(minval, ignorenan_minimum(abs.(v)))
+                minval = min(minval, minimum(abs(v)))
            end
        end
    end

    # now if the axis limits go to a smaller abs value, use that instead
    vmin, vmax = axis_limits(axis)
-    minval = NaNMath.min(minval, abs(vmin), abs(vmax))
+    minval = min(minval, abs(vmin), abs(vmax))

    minval
 end
@@ -911,24 +941,23 @@ function py_set_scale(ax, axis::Axis)
        elseif scale == :log10
            10
        end
-        kw[Symbol(:linthresh,letter)] = NaNMath.min(1e-16, py_compute_axis_minval(axis))
+        kw[Symbol(:linthresh,letter)] = max(1e-16, py_compute_axis_minval(axis))
        "symlog"
    end
    func(arg; kw...)
 end


-function py_set_axis_colors(sp, ax, a::Axis)
+function py_set_axis_colors(ax, a::Axis)
    for (loc, spine) in ax[:spines]
        spine[:set_color](py_color(a[:foreground_color_border]))
    end
    axissym = Symbol(a[:letter], :axis)
    if haskey(ax, axissym)
-        tickcolor = sp[:framestyle] in (:zerolines, :grid) ? py_color(plot_color(a[:foreground_color_grid], a[:gridalpha])) : py_color(a[:foreground_color_axis])
        ax[:tick_params](axis=string(a[:letter]), which="both",
-                         colors=tickcolor,
-                         labelcolor=py_color(a[:tickfontcolor]))
-        ax[axissym][:label][:set_color](py_color(a[:guidefontcolor]))
+                         colors=py_color(a[:foreground_color_axis]),
+                         labelcolor=py_color(a[:foreground_color_text]))
+        ax[axissym][:label][:set_color](py_color(a[:foreground_color_guide]))
    end
 end

@@ -943,7 +972,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
    fig[:clear]()
    dpi = plt[:dpi]
    fig[:set_size_inches](w/dpi, h/dpi, forward = true)
-    fig[set_facecolor_sym](py_color(plt[:background_color_outside]))
+    fig[:set_facecolor](py_color(plt[:background_color_outside]))
    fig[:set_dpi](dpi)

    # resize the window
@@ -982,69 +1011,12 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
                :title
            end
            ax[func][:set_text](sp[:title])
-            ax[func][:set_fontsize](py_dpi_scale(plt, sp[:titlefontsize]))
-            ax[func][:set_family](sp[:titlefontfamily])
-            ax[func][:set_color](py_color(sp[:titlefontcolor]))
+            ax[func][:set_fontsize](py_dpi_scale(plt, sp[:titlefont].pointsize))
+            ax[func][:set_family](sp[:titlefont].family)
+            ax[func][:set_color](py_color(sp[:foreground_color_title]))
            # ax[:set_title](sp[:title], loc = loc)
        end

-        # add the colorbar legend
-        if hascolorbar(sp)
-            # add keyword args for a discrete colorbar
-            slist = series_list(sp)
-            colorbar_series = slist[findfirst(hascolorbar.(slist))]
-            handle = colorbar_series[:serieshandle][end]
-            kw = KW()
-            if !isempty(sp[:zaxis][:discrete_values]) && colorbar_series[:seriestype] == :heatmap
-                locator, formatter = get_locator_and_formatter(sp[:zaxis][:discrete_values])
-                # kw[:values] = 1:length(sp[:zaxis][:discrete_values])
-                kw[:values] = sp[:zaxis][:continuous_values]
-                kw[:ticks] = locator
-                kw[:format] = formatter
-                kw[:boundaries] = vcat(0, kw[:values] + 0.5)
-            end
-
-            # create and store the colorbar object (handle) and the axis that it is drawn on.
-            # note: the colorbar axis is positioned independently from the subplot axis
-            fig = plt.o
-            cbax = fig[:add_axes]([0.8,0.1,0.03,0.8], label = string(gensym()))
-            cb = fig[:colorbar](handle; cax = cbax, kw...)
-            cb[:set_label](sp[:colorbar_title],size=py_dpi_scale(plt, sp[:yaxis][:guidefontsize]),family=sp[:yaxis][:guidefontfamily], color = py_color(sp[:yaxis][:guidefontcolor]))
-            for lab in cb[:ax][:yaxis][:get_ticklabels]()
-                  lab[:set_fontsize](py_dpi_scale(plt, sp[:yaxis][:tickfontsize]))
-                  lab[:set_family](sp[:yaxis][:tickfontfamily])
-                  lab[:set_color](py_color(sp[:yaxis][:tickfontcolor]))
-            end
-            sp.attr[:cbar_handle] = cb
-            sp.attr[:cbar_ax] = cbax
-        end
-
-        # framestyle
-        if !ispolar(sp) && !is3d(sp)
-            if sp[:framestyle] == :semi
-                intensity = 0.5
-                ax[:spines]["right"][:set_alpha](intensity)
-                ax[:spines]["top"][:set_alpha](intensity)
-                ax[:spines]["right"][:set_linewidth](intensity)
-                ax[:spines]["top"][:set_linewidth](intensity)
-            elseif sp[:framestyle] in (:axes, :origin)
-                ax[:spines]["right"][:set_visible](false)
-                ax[:spines]["top"][:set_visible](false)
-                if sp[:framestyle] == :origin
-                    ax[:spines]["bottom"][:set_position]("zero")
-                    ax[:spines]["left"][:set_position]("zero")
-                end
-            elseif sp[:framestyle] in (:grid, :none, :zerolines)
-                for (loc, spine) in ax[:spines]
-                    spine[:set_visible](false)
-                end
-                if sp[:framestyle] == :zerolines
-                    ax[:axhline](y = 0, color = py_color(sp[:xaxis][:foreground_color_axis]), lw = 0.75)
-                    ax[:axvline](x = 0, color = py_color(sp[:yaxis][:foreground_color_axis]), lw = 0.75)
-                end
-            end
-        end
-
        # axis attributes
        for letter in (:x, :y, :z)
            axissym = Symbol(letter, :axis)
@@ -1059,63 +1031,24 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            end
            py_set_scale(ax, axis)
            py_set_lims(ax, axis)
-            if ispolar(sp) && letter == :y
-                ax[:set_rlabel_position](90)
-            end
-            ticks = sp[:framestyle] == :none ? nothing : get_ticks(axis)
-            # don't show the 0 tick label for the origin framestyle
-            if sp[:framestyle] == :origin && length(ticks) > 1
-                ticks[2][ticks[1] .== 0] = ""
-            end
-            py_set_ticks(ax, ticks, letter)
-            pyaxis[:set_tick_params](direction = axis[:tick_direction] == :out ? "out" : "in")
+            py_set_ticks(ax, get_ticks(axis), letter)
            ax[Symbol("set_", letter, "label")](axis[:guide])
            if get(axis.d, :flip, false)
                ax[Symbol("invert_", letter, "axis")]()
            end
-            pyaxis[:label][:set_fontsize](py_dpi_scale(plt, axis[:guidefontsize]))
-            pyaxis[:label][:set_family](axis[:guidefontfamily])
+            pyaxis[:label][:set_fontsize](py_dpi_scale(plt, axis[:guidefont].pointsize))
+            pyaxis[:label][:set_family](axis[:guidefont].family)
            for lab in ax[Symbol("get_", letter, "ticklabels")]()
-                lab[:set_fontsize](py_dpi_scale(plt, axis[:tickfontsize]))
-                lab[:set_family](axis[:tickfontfamily])
+                lab[:set_fontsize](py_dpi_scale(plt, axis[:tickfont].pointsize))
+                lab[:set_family](axis[:tickfont].family)
                lab[:set_rotation](axis[:rotation])
            end
-            if axis[:grid] && !(ticks in (:none, nothing, false))
-                fgcolor = py_color(axis[:foreground_color_grid])
-                pyaxis[:grid](true,
-                    color = fgcolor,
-                    linestyle = py_linestyle(:line, axis[:gridstyle]),
-                    linewidth = axis[:gridlinewidth],
-                    alpha = axis[:gridalpha])
+            if sp[:grid]
+                fgcolor = py_color(sp[:foreground_color_grid])
+                pyaxis[:grid](true, color = fgcolor)
                ax[:set_axisbelow](true)
-            else
-                pyaxis[:grid](false)
            end
-            py_set_axis_colors(sp, ax, axis)
-        end
-
-        # showaxis
-        if !sp[:xaxis][:showaxis]
-            kw = KW()
-            for dir in (:top, :bottom)
-                if ispolar(sp)
-                    ax[:spines]["polar"][:set_visible](false)
-                else
-                    ax[:spines][string(dir)][:set_visible](false)
-                end
-                kw[dir] = kw[Symbol(:label,dir)] = "off"
-            end
-            ax[:xaxis][:set_tick_params](; which="both", kw...)
-        end
-        if !sp[:yaxis][:showaxis]
-            kw = KW()
-            for dir in (:left, :right)
-                if !ispolar(sp)
-                    ax[:spines][string(dir)][:set_visible](false)
-                end
-                kw[dir] = kw[Symbol(:label,dir)] = "off"
-            end
-            ax[:yaxis][:set_tick_params](; which="both", kw...)
+            py_set_axis_colors(ax, axis)
        end

        # aspect ratio
@@ -1124,19 +1057,11 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            ax[:set_aspect](isa(aratio, Symbol) ? string(aratio) : aratio, anchor = "C")
        end

-        #camera/view angle
-        if is3d(sp)
-            #convert azimuthal to match GR behaviour
-            #view_init(elevation, azimuthal) so reverse :camera args
-            ax[:view_init]((sp[:camera].-(90,0))[end:-1:1]...)
-        end
-
        # legend
        py_add_legend(plt, sp, ax)

        # this sets the bg color inside the grid
-        ax[set_facecolor_sym](py_color(sp[:background_color_inside]))
-
+        ax[:set_axis_bgcolor](py_color(sp[:background_color_inside]))
    end
    py_drawfig(fig)
 end
@@ -1168,7 +1093,7 @@ function _update_min_padding!(sp::Subplot{PyPlotBackend})
    # optionally add the width of colorbar labels and colorbar to rightpad
    if haskey(sp.attr, :cbar_ax)
        bb = py_bbox(sp.attr[:cbar_handle][:ax][:get_yticklabels]())
-        sp.attr[:cbar_width] = _cbar_width + width(bb) + 2.3mm + (sp[:colorbar_title] == "" ? 0px : 30px)
+        sp.attr[:cbar_width] = _cbar_width + width(bb) + 1mm + (sp[:colorbar_title] == "" ? 0px : 30px)
        rightpad = rightpad + sp.attr[:cbar_width]
    end

@@ -1226,20 +1151,10 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
        for series in series_list(sp)
            if should_add_to_legend(series)
                # add a line/marker and a label
-                push!(handles, if series[:seriestype] == :shape || series[:fillrange] != nothing
-                    pypatches[:Patch](
-                        edgecolor = py_color(_cycle(series[:linecolor],1)),
-                        facecolor = py_color(_cycle(series[:fillcolor],1)),
-                        linewidth = py_dpi_scale(plt, clamp(series[:linewidth], 0, 5)),
-                    )
-                elseif series[:seriestype] == :path
+                push!(handles, if series[:seriestype] == :shape
                    PyPlot.plt[:Line2D]((0,1),(0,0),
-                        color = py_color(_cycle(series[:fillcolor],1)),
-                        linewidth = py_dpi_scale(plt, clamp(series[:linewidth], 0, 5)),
-                        linestyle = py_linestyle(:path,series[:linestyle]),
-                        marker = py_marker(series[:markershape]),
-                        markeredgecolor = py_markerstrokecolor(series),
-                        markerfacecolor = py_markercolor(series)
+                        color = py_color(cycle(series[:fillcolor],1)),
+                        linewidth = py_dpi_scale(plt, 4)
                    )
                else
                    series[:serieshandle][1]
@@ -1254,22 +1169,20 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                labels,
                loc = get(_pyplot_legend_pos, leg, "best"),
                scatterpoints = 1,
-                fontsize = py_dpi_scale(plt, sp[:legendfontsize])
+                fontsize = py_dpi_scale(plt, sp[:legendfont].pointsize)
                # family = sp[:legendfont].family
                # framealpha = 0.6
            )
            leg[:set_zorder](1000)
-            sp[:legendtitle] != nothing && leg[:set_title](sp[:legendtitle])

            fgcolor = py_color(sp[:foreground_color_legend])
-            lfcolor = py_color(sp[:legendfontcolor])
            for txt in leg[:get_texts]()
-                PyPlot.plt[:setp](txt, color = lfcolor, family = sp[:legendfontfamily])
+                PyPlot.plt[:setp](txt, color = fgcolor, family = sp[:legendfont].family)
            end

            # set some legend properties
            frame = leg[:get_frame]()
-            frame[set_facecolor_sym](py_color(sp[:background_color_legend]))
+            frame[:set_facecolor](py_color(sp[:background_color_legend]))
            frame[:set_edgecolor](fgcolor)
        end
    end
@@ -1293,8 +1206,7 @@ function _update_plot_object(plt::Plot{PyPlotBackend})
        if haskey(sp.attr, :cbar_ax)
            cbw = sp.attr[:cbar_width]
            # this is the bounding box of just the colors of the colorbar (not labels)
-            has_toplabel = sp[:zaxis][:extrema].emax >= 1e7
-            cb_bbox = BoundingBox(right(sp.bbox)-cbw+1mm, top(sp.bbox) +  (has_toplabel ? 4mm : 2mm), _cbar_width-1mm, height(sp.bbox) - (has_toplabel ? 6mm : 4mm))
+            cb_bbox = BoundingBox(right(sp.bbox)-cbw+1mm, top(sp.bbox)+2mm, _cbar_width-1mm, height(sp.bbox)-4mm)
            pcts = bbox_to_pcts(cb_bbox, figw, figh)
            sp.attr[:cbar_ax][:set_position](pcts)
        end
@@ -1,10 +1,6 @@

 # https://github.com/Evizero/UnicodePlots.jl

-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "unicodeplots.jl")) 
-end
-
 const _unicodeplots_attr = merge_with_base_supported([
    :label,
    :legend,
@@ -2,9 +2,7 @@
 # NOTE:  backend should implement `html_body` and `html_head`

 # CREDIT: parts of this implementation were inspired by @joshday's PlotlyLocal.jl
-@require Revise begin
-    Revise.track(Plots, joinpath(Pkg.dir("Plots"), "src", "backends", "web.jl")) 
-end
+

 function standalone_html(plt::AbstractPlot; title::AbstractString = get(plt.attr, :window_title, "Plots.jl"))
    """
@@ -25,11 +23,11 @@ function open_browser_window(filename::AbstractString)
    @static if is_apple()
        return run(`open $(filename)`)
    end
-    @static if is_linux() || is_bsd()    # is_bsd() addition is as yet untested, but based on suggestion in https://github.com/JuliaPlots/Plots.jl/issues/681
+    @static if is_linux()
        return run(`xdg-open $(filename)`)
    end
    @static if is_windows()
-        return run(`$(ENV["COMSPEC"]) /c start "" "$(filename)"`)
+        return run(`$(ENV["COMSPEC"]) /c start $(filename)`)
    end
    warn("Unknown OS... cannot open browser window.")
 end
@@ -1,7 +1,7 @@


-const P2 = FixedSizeArrays.Vec{2,Float64}
-const P3 = FixedSizeArrays.Vec{3,Float64}
+typealias P2 StaticArrays.SVector{2,Float64}
+typealias 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))
@@ -11,7 +11,7 @@ compute_angle(v::P2) = (angle = atan2(v[2], v[1]); angle < 0 ? 2π - angle : ang

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

-struct Shape
+immutable Shape
    x::Vector{Float64}
    y::Vector{Float64}
    # function Shape(x::AVec, y::AVec)
@@ -22,13 +22,6 @@ struct Shape
    #     end
    # end
 end
-
-"""
-    Shape(x, y)
-    Shape(vertices)
-
-Construct a polygon to be plotted
-"""
 Shape(verts::AVec) = Shape(unzip(verts)...)
 Shape(s::Shape) = deepcopy(s)

@@ -39,7 +32,6 @@ vertices(shape::Shape) = collect(zip(shape.x, shape.y))
 #deprecated
@deprecate shape_coords coords

-"return the vertex points from a Shape or Segments object"
 function coords(shape::Shape)
    shape.x, shape.y
 end
@@ -164,7 +156,6 @@ Shape(k::Symbol) = deepcopy(_shapes[k])


 # uses the centroid calculation from https://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon
-"return the centroid of a Shape"
 function center(shape::Shape)
    x, y = coords(shape)
    n = length(x)
@@ -183,7 +174,7 @@ function center(shape::Shape)
    Cx / 6A, Cy / 6A
 end

-function scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
+function Base.scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
    sx, sy = coords(shape)
    cx, cy = c
    for i=1:length(sx)
@@ -198,7 +189,6 @@ function scale(shape::Shape, x::Real, y::Real = x, c = center(shape))
    scale!(shapecopy, x, y, c)
 end

-"translate a Shape in space"
 function translate!(shape::Shape, x::Real, y::Real = x)
    sx, sy = coords(shape)
    for i=1:length(sx)
@@ -237,7 +227,6 @@ function rotate!(shape::Shape, Θ::Real, c = center(shape))
    shape
 end

-"rotate an object in space"
 function rotate(shape::Shape, Θ::Real, c = center(shape))
    shapecopy = deepcopy(shape)
    rotate!(shapecopy, Θ, c)
@@ -246,7 +235,7 @@ end
 # -----------------------------------------------------------------------


-mutable struct Font
+type Font
  family::AbstractString
  pointsize::Int
  halign::Symbol
@@ -305,48 +294,22 @@ end

 function scalefontsize(k::Symbol, factor::Number)
    f = default(k)
-    f = round(Int, factor * f)
+    f.pointsize = round(Int, factor * f.pointsize)
    default(k, f)
 end
-
-"""
-    scalefontsizes(factor::Number)
-
-Scales all **current** font sizes by `factor`. For example `scalefontsizes(1.1)` increases all current font sizes by 10%. To reset to initial sizes, use `scalefontsizes()`
-"""
 function scalefontsizes(factor::Number)
-    for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
+    for k in (:titlefont, :guidefont, :tickfont, :legendfont)
        scalefontsize(k, factor)
    end
 end

-"""
-    scalefontsizes()
-
-Resets font sizes to initial default values.
-"""
-function scalefontsizes()
-  for k in (:titlefontsize, :guidefontsize, :tickfontsize, :legendfontsize)
-      f = default(k)
-      if k in keys(_initial_fontsizes)
-        factor = f / _initial_fontsizes[k]
-        scalefontsize(k, 1.0/factor)
-      end
-  end
-end
-
 "Wrap a string with font info"
-struct PlotText
+immutable PlotText
  str::AbstractString
  font::Font
 end
 PlotText(str) = PlotText(string(str), font())

-"""
-    text(string, args...)
-
-Create a PlotText object wrapping a string with font info, for plot annotations
-"""
 text(t::PlotText) = t
 text(str::AbstractString, f::Font) = PlotText(str, f)
 function text(str, args...)
@@ -359,18 +322,13 @@ Base.length(t::PlotText) = length(t.str)

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

-struct Stroke
+immutable Stroke
  width
  color
  alpha
  style
 end

-"""
-    stroke(args...; alpha = nothing)
-
-Define the properties of the stroke used in plotting lines
-"""
 function stroke(args...; alpha = nothing)
  width = 1
  color = :black
@@ -401,7 +359,7 @@ function stroke(args...; alpha = nothing)
 end


-struct Brush
+immutable Brush
  size  # fillrange, markersize, or any other sizey attribute
  color
  alpha
@@ -434,7 +392,7 @@ end

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

-mutable struct SeriesAnnotations
+type SeriesAnnotations
    strs::AbstractVector  # the labels/names
    font::Font
    baseshape::Nullable
@@ -488,7 +446,7 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
        msw,msh = anns.scalefactor
        msize = Float64[]
        shapes = Shape[begin
-            str = _cycle(anns.strs,i)
+            str = cycle(anns.strs,i)

            # get the width and height of the string (in mm)
            sw, sh = text_size(str, anns.font.pointsize)
@@ -504,7 +462,7 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
            # and then re-scale a copy of baseshape to match the w/h ratio
            maxscale = max(xscale, yscale)
            push!(msize, maxscale)
-            baseshape = _cycle(get(anns.baseshape),i)
+            baseshape = cycle(get(anns.baseshape),i)
            shape = scale(baseshape, msw*xscale/maxscale, msh*yscale/maxscale, (0,0))
        end for i=1:length(anns.strs)]
        series[:markershape] = shapes
@@ -513,7 +471,7 @@ function series_annotations_shapes!(series::Series, scaletype::Symbol = :pixels)
    return
 end

-mutable struct EachAnn
+type EachAnn
    anns
    x
    y
@@ -521,13 +479,13 @@ end
 Base.start(ea::EachAnn) = 1
 Base.done(ea::EachAnn, i) = ea.anns == nothing || isempty(ea.anns.strs) || i > length(ea.y)
 function Base.next(ea::EachAnn, i)
-    tmp = _cycle(ea.anns.strs,i)
+    tmp = cycle(ea.anns.strs,i)
    str,fnt = if isa(tmp, PlotText)
        tmp.str, tmp.font
    else
        tmp, ea.anns.font
    end
-    ((_cycle(ea.x,i), _cycle(ea.y,i), str, fnt), i+1)
+    ((cycle(ea.x,i), cycle(ea.y,i), str, fnt), i+1)
 end

 annotations(::Void) = []
@@ -538,21 +496,21 @@ annotations(sa::SeriesAnnotations) = sa
 # -----------------------------------------------------------------------

 "type which represents z-values for colors and sizes (and anything else that might come up)"
-struct ZValues
+immutable ZValues
  values::Vector{Float64}
  zrange::Tuple{Float64,Float64}
 end

-function zvalues(values::AVec{T}, zrange::Tuple{T,T} = (ignorenan_minimum(values), ignorenan_maximum(values))) where T<:Real
+function zvalues{T<:Real}(values::AVec{T}, zrange::Tuple{T,T} = (minimum(values), maximum(values)))
  ZValues(collect(float(values)), map(Float64, zrange))
 end

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

-abstract type AbstractSurface end
+abstract AbstractSurface

 "represents a contour or surface mesh"
-struct Surface{M<:AMat} <: AbstractSurface
+immutable Surface{M<:AMat} <: AbstractSurface
  surf::M
 end

@@ -563,8 +521,8 @@ 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)
+Base.copy(surf::Surface) = Surface{typeof(surf.surf)}(copy(surf.surf))
+Base.eltype{T}(surf::Surface{T}) = eltype(T)

 function expand_extrema!(a::Axis, surf::Surface)
    ex = a[:extrema]
@@ -575,7 +533,7 @@ function expand_extrema!(a::Axis, surf::Surface)
 end

 "For the case of representing a surface as a function of x/y... can possibly avoid allocations."
-struct SurfaceFunction <: AbstractSurface
+immutable SurfaceFunction <: AbstractSurface
    f::Function
 end

@@ -585,19 +543,19 @@ end
 # # I don't want to clash with ValidatedNumerics, but this would be nice:
 # ..(a::T, b::T) = (a,b)

-struct Volume{T}
+immutable 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))
+default_extents{T}(::Type{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
+function Volume{T}(v::Array{T,3},
+                   x_extents = default_extents(T),
+                   y_extents = default_extents(T),
+                   z_extents = default_extents(T))
    Volume(v, x_extents, y_extents, z_extents)
 end

@@ -605,25 +563,19 @@ 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
+Base.copy{T}(vol::Volume{T}) = Volume{T}(copy(vol.v), vol.x_extents, vol.y_extents, vol.z_extents)
+Base.eltype{T}(vol::Volume{T}) = T

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

 # style is :open or :closed (for now)
-struct Arrow
+immutable Arrow
    style::Symbol
    side::Symbol  # :head (default), :tail, or :both
    headlength::Float64
    headwidth::Float64
 end

-"""
-    arrow(args...)
-
-Define arrowheads to apply to lines - args are `style` (`:open` or `:closed`),
-`side` (`:head`, `:tail` or `:both`), `headlength` and `headwidth`
-"""
 function arrow(args...)
    style = :simple
    side = :head
@@ -673,14 +625,14 @@ end
 # -----------------------------------------------------------------------

 "Represents data values with formatting that should apply to the tick labels."
-struct Formatted{T}
+immutable Formatted{T}
    data::T
    formatter::Function
 end

 # -----------------------------------------------------------------------
-"create a BezierCurve for plotting"
-mutable struct BezierCurve{T <: FixedSizeArrays.Vec}
+
+type BezierCurve{T <: StaticArrays.SVector}
    control_points::Vector{T}
 end

@@ -693,8 +645,8 @@ 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::FixedSizeArrays.Vec{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
+Base.mean(x::Real, y::Real) = 0.5*(x+y)
+Base.mean{N,T<:Real}(ps::StaticArrays.SVector{N,T}...) = sum(ps) / length(ps)

@deprecate curve_points coords

@@ -707,7 +659,7 @@ function directed_curve(args...; kw...)
 end

 function extrema_plus_buffer(v, buffmult = 0.2)
-    vmin,vmax = ignorenan_extrema(v)
+    vmin,vmax = extrema(v)
    vdiff = vmax-vmin
    buffer = vdiff * buffmult
    vmin - buffer, vmax + buffer
@@ -558,7 +558,7 @@ function createGadflyAnnotationObject(x, y, txt::PlotText)
                            ))
 end

-function _add_annotations(plt::Plot{GadflyBackend}, anns::AVec{Tuple{X,Y,V}}) where {X,Y,V}
+function _add_annotations{X,Y,V}(plt::Plot{GadflyBackend}, anns::AVec{Tuple{X,Y,V}})
    for ann in anns
        push!(plt.o.guides, createGadflyAnnotationObject(ann...))
    end
@@ -614,7 +614,7 @@ function getxy(plt::Plot{GadflyBackend}, i::Integer)
    mapping[:x], mapping[:y]
 end

-function setxy!(plt::Plot{GadflyBackend}, xy::Tuple{X,Y}, i::Integer) where {X,Y}
+function setxy!{X,Y}(plt::Plot{GadflyBackend}, xy::Tuple{X,Y}, i::Integer)
    for mapping in getGadflyMappings(plt, i)
        mapping[:x], mapping[:y] = xy
    end
@@ -677,7 +677,7 @@ setGadflyDisplaySize(plt::Plot) = setGadflyDisplaySize(plt.attr[:size]...)
 # -------------------------------------------------------------------------


-function doshow(io::IO, func, plt::AbstractPlot{P}) where P<:Union{GadflyBackend,ImmerseBackend}
+function doshow{P<:Union{GadflyBackend,ImmerseBackend}}(io::IO, func, plt::AbstractPlot{P})
    gplt = getGadflyContext(plt)
    setGadflyDisplaySize(plt)
    Gadfly.draw(func(io, Compose.default_graphic_width, Compose.default_graphic_height), gplt)
@@ -692,7 +692,7 @@ getGadflyWriteFunc(::MIME"application/x-tex") = Gadfly.PGF
 getGadflyWriteFunc(m::MIME) = error("Unsupported in Gadfly/Immerse: ", m)

 for mime in (MIME"image/png", MIME"image/svg+xml", MIME"application/pdf", MIME"application/postscript", MIME"application/x-tex")
-    @eval function Base.show(io::IO, ::$mime, plt::AbstractPlot{P}) where P<:Union{GadflyBackend,ImmerseBackend}
+    @eval function Base.show{P<:Union{GadflyBackend,ImmerseBackend}}(io::IO, ::$mime, plt::AbstractPlot{P})
        func = getGadflyWriteFunc($mime())
        doshow(io, func, plt)
    end
@@ -2,7 +2,7 @@

 # Geometry which displays arbitrary shapes at given (x, y) positions.
 # note: vertices is a list of shapes
-struct ShapeGeometry <: Gadfly.GeometryElement
+immutable ShapeGeometry <: Gadfly.GeometryElement
    vertices::AbstractVector #{Tuple{Float64,Float64}}
    tag::Symbol

@@ -84,7 +84,7 @@ function make_polygon(geom::ShapeGeometry, xs::AbstractArray, ys::AbstractArray,
    x = Compose.x_measure(xs[mod1(i, length(xs))])
    y = Compose.y_measure(ys[mod1(i, length(ys))])
    r = rs[mod1(i, length(rs))]
-    polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in _cycle(geom.vertices, i)]
+    polys[i] = T[(x + r * sx, y + r * sy) for (sx,sy) in cycle(geom.vertices, i)]
  end
  Gadfly.polygon(polys, geom.tag)
 end
@@ -61,7 +61,7 @@ end

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

-function _add_annotations(plt::Plot{ImmerseBackend}, anns::AVec{Tuple{X,Y,V}}) where {X,Y,V}
+function _add_annotations{X,Y,V}(plt::Plot{ImmerseBackend}, anns::AVec{Tuple{X,Y,V}})
  for ann in anns
    push!(getGadflyContext(plt).guides, createGadflyAnnotationObject(ann...))
  end
@@ -76,7 +76,7 @@ function getxy(plt::Plot{ImmerseBackend}, i::Integer)
  mapping[:x], mapping[:y]
 end

-function setxy!(plt::Plot{ImmerseBackend}, xy::Tuple{X,Y}, i::Integer) where {X,Y}
+function setxy!{X,Y}(plt::Plot{ImmerseBackend}, xy::Tuple{X,Y}, i::Integer)
  for mapping in getGadflyMappings(plt, i)
    mapping[:x], mapping[:y] = xy
  end
@@ -218,7 +218,7 @@ function createQwtAnnotation(plt::Plot, x, y, val::AbstractString)
  marker[:attach](plt.o.widget)
 end

-function _add_annotations(plt::Plot{QwtBackend}, anns::AVec{Tuple{X,Y,V}}) where {X,Y,V}
+function _add_annotations{X,Y,V}(plt::Plot{QwtBackend}, anns::AVec{Tuple{X,Y,V}})
  for ann in anns
    createQwtAnnotation(plt, ann...)
  end
@@ -233,7 +233,7 @@ function getxy(plt::Plot{QwtBackend}, i::Int)
  series.x, series.y
 end

-function setxy!(plt::Plot{QwtBackend}, xy::Tuple{X,Y}, i::Integer) where {X,Y}
+function setxy!{X,Y}(plt::Plot{QwtBackend}, xy::Tuple{X,Y}, i::Integer)
  series = plt.o.lines[i]
  series.x, series.y = xy
  plt
@@ -217,7 +217,7 @@ function createWinstonAnnotationObject(plt::Plot{WinstonBackend}, x, y, val::Abs
  Winston.text(x, y, val)
 end

-function _add_annotations(plt::Plot{WinstonBackend}, anns::AVec{Tuple{X,Y,V}}) where {X,Y,V}
+function _add_annotations{X,Y,V}(plt::Plot{WinstonBackend}, anns::AVec{Tuple{X,Y,V}})
  for ann in anns
    createWinstonAnnotationObject(plt, ann...)
  end
@@ -1,5 +1,5 @@

-abstract type ColorScheme end
+abstract ColorScheme

 Base.getindex(scheme::ColorScheme, i::Integer) = getColor(scheme, i)

@@ -34,9 +34,9 @@ getColorVector(scheme::ColorScheme) = [getColor(scheme)]
 colorscheme(scheme::ColorScheme) = scheme
 colorscheme(s::AbstractString; kw...) = colorscheme(Symbol(s); kw...)
 colorscheme(s::Symbol; kw...) = haskey(_gradients, s) ? ColorGradient(s; kw...) : ColorWrapper(convertColor(s); kw...)
-colorscheme(s::Symbol, vals::AVec{T}; kw...) where {T<:Real} = ColorGradient(s, vals; kw...)
+colorscheme{T<:Real}(s::Symbol, vals::AVec{T}; kw...) = ColorGradient(s, vals; kw...)
 colorscheme(cs::AVec, vs::AVec; kw...) = ColorGradient(cs, vs; kw...)
-colorscheme(cs::AVec{T}; kw...) where {T<:Colorant} = ColorGradient(cs; kw...)
+colorscheme{T<:Colorant}(cs::AVec{T}; kw...) = ColorGradient(cs; kw...)
 colorscheme(f::Function; kw...) = ColorFunction(f; kw...)
 colorscheme(v::AVec; kw...) = ColorVector(v; kw...)
 colorscheme(m::AMat; kw...) = size(m,1) == 1 ? map(c->colorscheme(c; kw...), m) : [colorscheme(m[:,i]; kw...) for i in 1:size(m,2)]'
@@ -98,7 +98,7 @@ const _gradients = KW(
    :lighttest    => map(c -> lighten(c, 0.3), _testColors),
  )

-function register_gradient_colors(name::Symbol, colors::AVec{C}) where C<:Colorant
+function register_gradient_colors{C<:Colorant}(name::Symbol, colors::AVec{C})
    _gradients[name] = colors
 end

@@ -109,11 +109,11 @@ default_gradient() = ColorGradient(:inferno)
 # --------------------------------------------------------------

 "Continuous gradient between values.  Wraps a list of bounding colors and the values they represent."
-struct ColorGradient <: ColorScheme
+immutable ColorGradient <: ColorScheme
  colors::Vector
  values::Vector

-  function ColorGradient(cs::AVec, vals::AVec{S} = linspace(0, 1, length(cs)); alpha = nothing) where S<:Real
+  function ColorGradient{S<:Real}(cs::AVec, vals::AVec{S} = linspace(0, 1, length(cs)); alpha = nothing)
    if length(cs) == length(vals)
      return new(convertColor(cs,alpha), collect(vals))
    end
@@ -138,7 +138,7 @@ Base.getindex(cs::ColorGradient, z::Number) = getColorZ(cs, z)


 # create a gradient from a symbol (blues, reds, etc) and vector of boundary values
-function ColorGradient(s::Symbol, vals::AVec{T} = 0:0; kw...) where T<:Real
+function ColorGradient{T<:Real}(s::Symbol, vals::AVec{T} = 0:0; kw...)
  haskey(_gradients, s) || error("Invalid gradient symbol.  Choose from: ", sort(collect(keys(_gradients))))
  cs = _gradients[s]
  if vals == 0:0
@@ -208,7 +208,7 @@ end
 # --------------------------------------------------------------

 "Wraps a function, taking an index and returning a Colorant"
-struct ColorFunction <: ColorScheme
+immutable ColorFunction <: ColorScheme
  f::Function
 end

@@ -217,7 +217,7 @@ getColor(scheme::ColorFunction, idx::Int) = scheme.f(idx)
 # --------------------------------------------------------------

 "Wraps a function, taking an z-value and returning a Colorant"
-struct ColorZFunction <: ColorScheme
+immutable ColorZFunction <: ColorScheme
  f::Function
 end

@@ -226,7 +226,7 @@ getColorZ(scheme::ColorZFunction, z::Real) = scheme.f(z)
 # --------------------------------------------------------------

 "Wraps a vector of colors... may be vector of Symbol/String/Colorant"
-struct ColorVector <: ColorScheme
+immutable ColorVector <: ColorScheme
  v::Vector{Colorant}
  ColorVector(v::AVec; alpha = nothing) = new(convertColor(v,alpha))
 end
@@ -238,7 +238,7 @@ getColorVector(scheme::ColorVector) = scheme.v
 # --------------------------------------------------------------

 "Wraps a single color"
-struct ColorWrapper <: ColorScheme
+immutable ColorWrapper <: ColorScheme
  c::RGBA
  ColorWrapper(c::Colorant; alpha = nothing) = new(convertColor(c, alpha))
 end
@@ -347,8 +347,8 @@ function get_color_palette(palette, bgcolor::Union{Colorant,ColorWrapper}, numco
  RGBA[getColorZ(grad, z) for z in zrng]
 end

-function get_color_palette(palette::Vector{C},
-bgcolor::Union{Colorant,ColorWrapper}, numcolors::Integer) where C<:Colorant
+function get_color_palette{C<:Colorant}(palette::Vector{C},
+            bgcolor::Union{Colorant,ColorWrapper}, numcolors::Integer)
  palette
 end

@@ -5,21 +5,21 @@
 # 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 = Union{Function, AVec{Function}}
+typealias FuncOrFuncs @compat(Union{Function, AVec{Function}})

 all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))

 # missing
-convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing
+convertToAnyVector(v::@compat(Void), d::KW) = Any[nothing], nothing

 # fixed number of blank series
 convertToAnyVector(n::Integer, d::KW) = Any[zeros(0) for i in 1:n], nothing

 # numeric vector
-convertToAnyVector(v::AVec{T}, d::KW) where {T<:Number} = Any[v], nothing
+convertToAnyVector{T<:Number}(v::AVec{T}, d::KW) = Any[v], nothing

 # string vector
-convertToAnyVector(v::AVec{T}, d::KW) where {T<:AbstractString} = Any[v], nothing
+convertToAnyVector{T<:@compat(AbstractString)}(v::AVec{T}, d::KW) = Any[v], nothing

 function convertToAnyVector(v::AMat, d::KW)
    if all3D(d)
@@ -39,7 +39,7 @@ convertToAnyVector(s::Surface, d::KW) = Any[s], nothing
 # convertToAnyVector(v::AVec{OHLC}, d::KW) = Any[v], nothing

 # dates
-convertToAnyVector(dts::AVec{D}, d::KW) where {D<:Union{Date,DateTime}} = Any[dts], nothing
+convertToAnyVector{D<:Union{Date,DateTime}}(dts::AVec{D}, d::KW) = Any[dts], nothing

 # list of things (maybe other vectors, functions, or something else)
 function convertToAnyVector(v::AVec, d::KW)
@@ -1,7 +1,7 @@
 """
 Holds all data needed for a documentation example... header, description, and plotting expression (Expr)
 """
-mutable struct PlotExample
+type PlotExample
  header::AbstractString
  desc::AbstractString
  exprs::Vector{Expr}
@@ -18,14 +18,7 @@ PlotExample("Lines",
 ),

 PlotExample("Functions, adding data, and animations",
-"""
-Plot multiple functions.  You can also put the function first, or use the form `plot(f,
-xmin, xmax)` where f is a Function or AbstractVector{Function}.\n\nGet series data:
-`x, y = plt[i]`.  Set series data: `plt[i] = (x,y)`. Add to the series with
-`push!`/`append!`.\n\nEasily build animations.  (`convert` or `ffmpeg` must be available
-to generate the animation.)  Use command `gif(anim, filename, fps=15)` to save the
-animation.
-""",
+    "Plot multiple functions.  You can also put the function first, or use the form `plot(f, xmin, xmax)` where f is a Function or AbstractVector{Function}.\n\nGet series data: `x, y = plt[i]`.  Set series data: `plt[i] = (x,y)`. Add to the series with `push!`/`append!`.\n\nEasily build animations.  (`convert` or `ffmpeg` must be available to generate the animation.)  Use command `gif(anim, filename, fps=15)` to save the animation.",
    [:(begin
        p = plot([sin,cos], zeros(0), leg=false)
        anim = Animation()
@@ -44,35 +37,23 @@ PlotExample("Parametric plots",
 ),

 PlotExample("Colors",
-"""
-Access predefined palettes (or build your own with the `colorscheme` method).
-Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set
-the `z` argument to turn on series gradients.
-""",
+    "Access predefined palettes (or build your own with the `colorscheme` method).  Line/marker colors are auto-generated from the plot's palette, unless overridden.  Set the `z` argument to turn on series gradients.",
    [:(begin
-y = rand(100)
-plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=0, α=0.6)
-scatter!(y, zcolor=abs.(y-.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs.(y-0.5)+4,
-         lab="grad")
+        y = rand(100)
+        plot(0:10:100,rand(11,4),lab="lines",w=3,palette=:grays,fill=0, α=0.6)
+        scatter!(y, zcolor=abs(y-.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs(y-0.5)+4, lab="grad")
    end)]
 ),

 PlotExample("Global",
-"""
-Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow
-you to pass a tuple or value which will be mapped to the relevant args automatically.
-The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during
-the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`,
-`yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`
-""",
+    "Change the guides/background/limits/ticks.  Convenience args `xaxis` and `yaxis` allow you to pass a tuple or value which will be mapped to the relevant args automatically.  The `xaxis` below will be replaced with `xlabel` and `xlims` args automatically during the preprocessing step. You can also use shorthand functions: `title!`, `xaxis!`, `yaxis!`, `xlabel!`, `ylabel!`, `xlims!`, `ylims!`, `xticks!`, `yticks!`",
    [:(begin
-y = rand(20,3)
-plot(y, xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2),
-     leg=false)
-hline!(mean(y,1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))
-vline!([5,10])
-title!("TITLE")
-yaxis!("YLABEL", :log10)
+        y = rand(20,3)
+        plot(y, xaxis=("XLABEL",(-5,30),0:2:20,:flip), background_color = RGB(0.2,0.2,0.2), leg=false)
+        hline!(mean(y,1)+rand(1,3), line=(4,:dash,0.6,[:lightgreen :green :darkgreen]))
+        vline!([5,10])
+        title!("TITLE")
+        yaxis!("YLABEL", :log10)
    end)]
 ),

@@ -85,21 +66,14 @@ yaxis!("YLABEL", :log10)
 PlotExample("Images",
    "Plot an image.  y-axis is set to flipped",
    [:(begin
-        import FileIO
-        img = FileIO.load(Pkg.dir("PlotReferenceImages","Plots","pyplot","0.7.0","ref1.png"))
+        import Images
+        img = Images.load(Pkg.dir("PlotReferenceImages","Plots","pyplot","0.7.0","ref1.png"))
        plot(img)
    end)]
 ),

 PlotExample("Arguments",
-"""
-Plot multiple series with different numbers of points.  Mix arguments that apply to all
-series (marker/markersize) with arguments unique to each series (colors).  Special
-arguments `line`, `marker`, and `fill` will automatically figure out what arguments to
-set (for example, we are setting the `linestyle`, `linewidth`, and `color` arguments with
-`line`.)  Note that we pass a matrix of colors, and this applies the colors to each
-series.
-""",
+    "Plot multiple series with different numbers of points.  Mix arguments that apply to all series (marker/markersize) with arguments unique to each series (colors).  Special arguments `line`, `marker`, and `fill` will automatically figure out what arguments to set (for example, we are setting the `linestyle`, `linewidth`, and `color` arguments with `line`.)  Note that we pass a matrix of colors, and this applies the colors to each series.",
    [:(begin
        ys = Vector[rand(10), rand(20)]
        plot(ys, color=[:black :orange], line=(:dot,4), marker=([:hex :d],12,0.8,stroke(3,:gray)))
@@ -141,23 +115,20 @@ PlotExample("Line types",
 PlotExample("Line styles",
    "",
    [:(begin
-styles = filter(s -> s in Plots.supported_styles(),
-                [:solid, :dash, :dot, :dashdot, :dashdotdot])
-styles = reshape(styles, 1, length(styles)) # Julia 0.6 unfortunately gives an error when transposing symbol vectors
-n = length(styles)
-y = cumsum(randn(20,n),1)
-plot(y, line = (5, styles), label = map(string,styles), legendtitle = "linestyle")
-             end)]
+        styles = filter(s -> s in Plots.supported_styles(), [:solid, :dash, :dot, :dashdot, :dashdotdot])'
+        n = length(styles)
+        y = cumsum(randn(20,n),1)
+        plot(y, line = (5, styles), label = map(string,styles))
+    end)]
 ),

 PlotExample("Marker types",
    "",
    [:(begin
-        markers = filter(m -> m in Plots.supported_markers(), Plots._shape_keys)
-        markers = reshape(markers, 1, length(markers))
+        markers = filter(m -> m in Plots.supported_markers(), Plots._shape_keys)'
        n = length(markers)
        x = linspace(0,10,n+2)[2:end-1]
-        y = repmat(reshape(reverse(x),1,:), n, 1)
+        y = repmat(reverse(x)', n, 1)
        scatter(x, y, m=(8,:auto), lab=map(string,markers), bg=:linen, xlim=(0,10), ylim=(0,10))
    end)]
 ),
@@ -172,30 +143,24 @@ PlotExample("Bar",
 PlotExample("Histogram",
    "",
    [:(begin
-        histogram(randn(1000), bins = :scott, weights = repeat(1:5, outer = 200))
+        histogram(randn(1000), nbins=20)
    end)]
 ),

 PlotExample("Subplots",
-"""
-Use the `layout` keyword, and optionally the convenient `@layout` macro to generate
-arbitrarily complex subplot layouts.
-""",
+    """
+    Use the `layout` keyword, and optionally the convenient `@layout` macro to generate arbitrarily complex subplot layouts.
+    """,
    [:(begin
-l = @layout([a{0.1h}; b [c;d e]])
-plot(randn(100,5), layout=l, t=[:line :histogram :scatter :steppre :bar], leg=false,
-     ticks=nothing, border=:none)
+        l = @layout([a{0.1h}; b [c;d e]])
+        plot(randn(100,5), layout=l, t=[:line :histogram :scatter :steppre :bar], leg=false, ticks=nothing, border=false)
    end)]
 ),

 PlotExample("Adding to subplots",
-"""
-Note here the automatic grid layout, as well as the order in which new series are added
-to the plots.
-""",
+    "Note here the automatic grid layout, as well as the order in which new series are added to the plots.",
    [:(begin
-plot(Plots.fakedata(100,10), layout=4, palette=[:grays :blues :heat :lightrainbow],
-     bg_inside=[:orange :pink :darkblue :black])
+        plot(Plots.fakedata(100,10), layout=4, palette=[:grays :blues :heat :lightrainbow], bg_inside=[:orange :pink :darkblue :black])
    end)]
 ),

@@ -208,68 +173,48 @@ PlotExample("",
 ),

 PlotExample("Open/High/Low/Close",
-"""
-Create an OHLC chart.  Pass in a list of (open,high,low,close) tuples as your `y`
-argument.  This uses recipes to first convert the tuples to OHLC objects, and
-subsequently create a :path series with the appropriate line segments.
-""",
+    "Create an OHLC chart.  Pass in a list of (open,high,low,close) tuples as your `y` argument.  This uses recipes to first convert the tuples to OHLC objects, and subsequently create a :path series with the appropriate line segments.",
    [:(begin
-n=20
-hgt=rand(n)+1
-bot=randn(n)
-openpct=rand(n)
-closepct=rand(n)
-y = OHLC[(openpct[i]*hgt[i]+bot[i], bot[i]+hgt[i], bot[i],
-          closepct[i]*hgt[i]+bot[i]) for i in 1:n]
-ohlc(y)
+        n=20
+        hgt=rand(n)+1
+        bot=randn(n)
+        openpct=rand(n)
+        closepct=rand(n)
+        y = OHLC[(openpct[i]*hgt[i]+bot[i], bot[i]+hgt[i], bot[i], closepct[i]*hgt[i]+bot[i]) for i in 1:n]
+        ohlc(y)
    end)]
 ),

 PlotExample("Annotations",
-"""
-The `annotations` keyword is used for text annotations in data-coordinates.  Pass in a
-tuple (x,y,text) or a vector of annotations.  `annotate!(ann)` is shorthand for `plot!(;
-annotation=ann)`.  Series annotations are used for annotating individual data points.
-They require only the annotation... x/y values are computed.  A `PlotText` object can be
-build with the method `text(string, attr...)`, which wraps font and color attributes.
-""",
+    "The `annotations` keyword is used for text annotations in data-coordinates.  Pass in a tuple (x,y,text) or a vector of annotations.  `annotate!(ann)` is shorthand for `plot!(; annotation=ann)`.  Series annotations are used for annotating individual data points.  They require only the annotation... x/y values are computed.  A `PlotText` object can be build with the method `text(string, attr...)`, which wraps font and color attributes.",
    [:(begin
-y = rand(10)
-plot(y, annotations = (3,y[3],text("this is #3",:left)), leg=false)
-annotate!([(5, y[5], text("this is #5",16,:red,:center)),
-          (10, y[10], text("this is #10",:right,20,"courier"))])
-scatter!(linspace(2,8,6), rand(6), marker=(50,0.2,:orange),
-         series_annotations = ["series","annotations","map","to","series",
-                               text("data",:green)])
+        y = rand(10)
+        plot(y, annotations = (3,y[3],text("this is #3",:left)), leg=false)
+        annotate!([(5, y[5], text("this is #5",16,:red,:center)), (10, y[10], text("this is #10",:right,20,"courier"))])
+        scatter!(linspace(2,8,6), rand(6), marker=(50,0.2,:orange), series_annotations = ["series","annotations","map","to","series",text("data",:green)])
    end)]
 ),

 PlotExample("Custom Markers",
-"""A `Plots.Shape` is a light wrapper around vertices of a polygon.  For supported
-backends, pass arbitrary polygons as the marker shapes.  Note: The center is (0,0) and
-the size is expected to be rougly the area of the unit circle.
-""",
+    "A `Plots.Shape` is a light wrapper around vertices of a polygon.  For supported backends, pass arbitrary polygons as the marker shapes.  Note: The center is (0,0) and the size is expected to be rougly the area of the unit circle.",
    [:(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.7rand(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)
+        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.7rand(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)]
 ),

 PlotExample("Contours",
-"""
-Any value for fill works here.  We first build a filled contour from a function, then an
-unfilled contour from a matrix.
-""",
+    "Any value for fill works here.  We first build a filled contour from a function, then an unfilled contour from a matrix.",
    [:(begin
        x = 1:0.5:20
        y = 1:0.5:10
        f(x,y) = (3x+y^2)*abs(sin(x)+cos(y))
-        X = repmat(reshape(x,1,:), length(y), 1)
+        X = repmat(x', length(y), 1)
        Y = repmat(y, 1, length(x))
        Z = map(f, X, Y)
        p1 = contour(x, y, f, fill=true)
@@ -305,7 +250,7 @@ PlotExample("DataFrames",
    [:(begin
        import RDatasets
        iris = RDatasets.dataset("datasets", "iris")
-        @df iris scatter(:SepalLength, :SepalWidth, group=:Species,
+        scatter(iris, :SepalLength, :SepalWidth, group=:Species,
            title = "My awesome plot", xlabel = "Length", ylabel = "Width",
            marker = (0.5, [:cross :hex :star7], 12), bg=RGB(.2,.2,.2))
    end)]
@@ -315,8 +260,7 @@ PlotExample("Groups and Subplots",
    "",
    [:(begin
        group = rand(map(i->"group $i",1:4),100)
-        plot(rand(100), layout=@layout([a b;c]), group=group,
-            linetype=[:bar :scatter :steppre], linecolor = :match)
+        plot(rand(100), layout=@layout([a b;c]), group=group, linetype=[:bar :scatter :steppre])
    end)]
 ),

@@ -324,7 +268,7 @@ PlotExample("Polar Plots",
    "",
    [:(begin
        Θ = linspace(0,1.5π,100)
-        r = abs.(0.1randn(100)+sin.(3Θ))
+        r = abs(0.1randn(100)+sin(3Θ))
        plot(Θ, r, proj=:polar, m=2)
    end)]
 ),
@@ -334,7 +278,7 @@ PlotExample("Heatmap, categorical axes, and aspect_ratio",
    [:(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,:))
+        z = float((1:4)*(1:10)')
        heatmap(xs, ys, z, aspect_ratio=1)
    end)]
 ),
@@ -342,10 +286,9 @@ PlotExample("Heatmap, categorical axes, and aspect_ratio",
 PlotExample("Layouts, margins, label rotation, title location",
    "",
    [:(begin
-        using Plots.PlotMeasures # for Measures, e.g. mm and px
        plot(rand(100,6),layout=@layout([a b; c]),title=["A" "B" "C"],
                        title_location=:left, left_margin=[20mm 0mm],
-                        bottom_margin=10px, xrotation=60)
+                        bottom_margin=50px, xrotation=60)
    end)]
 ),

@@ -354,67 +297,10 @@ PlotExample("Boxplot and Violin series recipes",
    [:(begin
        import RDatasets
        singers = RDatasets.dataset("lattice", "singer")
-        @df singers violin(:VoicePart, :Height, line = 0, fill = (0.2, :blue))
-        @df singers boxplot!(:VoicePart, :Height, line = (2,:black), fill = (0.3, :orange))
+        violin(singers, :VoicePart, :Height, line = 0, fill = (0.2, :blue))
+        boxplot!(singers, :VoicePart, :Height, line = (2,:black), fill = (0.3, :orange))
    end)]
-),
-
-PlotExample("Animation with subplots",
-    "The `layout` macro can be used to create an animation with subplots.",
-    [:(begin
-        l = @layout([[a; b] c])
-        p = plot(plot([sin,cos],1,leg=false),
-        scatter([atan,cos],1,leg=false),
-        plot(log,1,xlims=(1,10π),ylims=(0,5),leg=false),layout=l)
-
-        anim = Animation()
-        for x = linspace(1,10π,100)
-          plot(push!(p,x,Float64[sin(x),cos(x),atan(x),cos(x),log(x)]))
-          frame(anim)
-        end
-    end)]
-),
-
-PlotExample("Spy",
-"""
-For a matrix `mat` with unique nonzeros `spy(mat)` returns a colorless plot. If `mat` has 
-various different nonzero values, a colorbar is added. The colorbar can be disabled with 
-`legend = nothing`.
-""",
-    [:(begin
-    a = spdiagm((ones(50), ones(49), ones(49), ones(40), ones(40)),(0, 1, -1, 10, -10))
-    b = spdiagm((1:50, 1:49, 1:49, 1:40, 1:40),(0, 1, -1, 10, -10))
-    plot(spy(a), spy(b), title = ["Unique nonzeros" "Different nonzeros"])
-    end)]
-),
-
-PlotExample("Magic grid argument",
-"""
-The grid lines can be modified individually for each axis with the magic `grid` argument.
-""",
-    [:(begin
-    x = rand(10)
-    p1 = plot(x, title = "Default looks")
-    p2 = plot(x, grid = (:y, :olivedrab, :dot, 1, 0.9), title = "Modified y grid")
-    p3 = plot(deepcopy(p2), title = "Add x grid")
-    xgrid!(p3, :on, :cadetblue, 2, :dashdot, 0.4)
-    plot(p1, p2, p3, layout = (1, 3), label = "", fillrange = 0, fillalpha = 0.3)
-    end)]
-),
-
-PlotExample("Framestyle",
-"""
-The style of the frame/axes of a (sub)plot can be changed with the `framestyle`
-attribute. The default framestyle is `:axes`.
-""",
-    [:(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 = RowVector(1:6), layout = 6, label = "", markerstrokewidth = 0,
-        ticks = -2:2)
-    end)]
-),
+)

 ]

@@ -435,13 +321,6 @@ function test_examples(pkgname::Symbol, idx::Int; debug = false, disp = true)
 end

 # generate all plots and create a dict mapping idx --> plt
-"""
-test_examples(pkgname[, idx]; debug = false, disp = true, sleep = nothing,
-                                        skip = [], only = nothing
-
-Run the `idx` test example for a given backend, or all examples if `idx`
-is not specified.
-"""
 function test_examples(pkgname::Symbol; debug = false, disp = true, sleep = nothing,
                                        skip = [], only = nothing)
  Plots._debugMode.on = debug
@@ -1,19 +1,23 @@

 # NOTE: (0,0) is the top-left !!!

+# allow pixels and percentages
+const px = AbsoluteLength(0.254)
+const pct = Length{:pct, Float64}(1.0)
+
 to_pixels(m::AbsoluteLength) = m.value / 0.254

 const _cbar_width = 5mm

-Base.broadcast(::typeof(Base.:.*), m::Measure, n::Number) = m * n
-Base.broadcast(::typeof(Base.:.*), m::Number, n::Measure) = m * n
+Base.:.*(m::Measure, n::Number) = m * n
+Base.:.*(n::Number, m::Measure) = m * n
 Base.:-(m::Measure, a::AbstractArray) = map(ai -> m - ai, a)
 Base.:-(a::AbstractArray, m::Measure) = map(ai -> ai - m, a)
 Base.zero(::Type{typeof(mm)}) = 0mm
 Base.one(::Type{typeof(mm)}) = 1mm
 Base.typemin(::typeof(mm)) = -Inf*mm
 Base.typemax(::typeof(mm)) = Inf*mm
-Base.convert(::Type{F}, l::AbsoluteLength) where {F<:AbstractFloat} = convert(F, l.value)
+Base.convert{F<:AbstractFloat}(::Type{F}, l::AbsoluteLength) = convert(F, l.value)

 # TODO: these are unintuitive and may cause tricky bugs
 # Base.:+(m1::AbsoluteLength, m2::Length{:pct}) = AbsoluteLength(m1.value * (1 + m2.value))
@@ -95,7 +99,7 @@ end
 # -----------------------------------------------------------

 # points combined by x/y, pct, and length
-mutable struct MixedMeasures
+type MixedMeasures
    xy::Float64
    pct::Float64
    len::AbsoluteLength
@@ -129,12 +133,7 @@ make_measure_hor(m::Measure) = m
 make_measure_vert(n::Number) = n * h
 make_measure_vert(m::Measure) = m

-"""
-    bbox(x, y, w, h [,originargs...])
-    bbox(layout)

-Create a bounding box for plotting
-"""
 function bbox(x, y, w, h, oarg1::Symbol, originargs::Symbol...)
    oargs = vcat(oarg1, originargs...)
    orighor = :left
@@ -216,7 +215,7 @@ bottompad(layout::AbstractLayout) = 0mm
 # RootLayout

 # this is the parent of the top-level layout
-struct RootLayout <: AbstractLayout end
+immutable RootLayout <: AbstractLayout end

 Base.parent(::RootLayout) = nothing
 parent_bbox(::RootLayout) = defaultbox
@@ -226,7 +225,7 @@ bbox(::RootLayout) = defaultbox
 # EmptyLayout

 # contains blank space
-mutable struct EmptyLayout <: AbstractLayout
+type EmptyLayout <: AbstractLayout
    parent::AbstractLayout
    bbox::BoundingBox
    attr::KW  # store label, width, and height for initialization
@@ -244,7 +243,7 @@ _update_min_padding!(layout::EmptyLayout) = nothing
 # GridLayout

 # nested, gridded layout with optional size percentages
-mutable struct GridLayout <: AbstractLayout
+type GridLayout <: AbstractLayout
    parent::AbstractLayout
    minpad::Tuple # leftpad, toppad, rightpad, bottompad
    bbox::BoundingBox
@@ -254,13 +253,6 @@ mutable struct GridLayout <: AbstractLayout
    attr::KW
 end

-"""
-    grid(args...; kw...)
-
-Create a grid layout for subplots. `args` specify the dimensions, e.g.
-`grid(3,2, widths = (0.6,04))` creates a grid with three rows and two
-columns of different width.
-"""
 grid(args...; kw...) = GridLayout(args...; kw...)

 function GridLayout(dims...;
@@ -481,12 +473,12 @@ function layout_args(n::Integer)
    GridLayout(nr, nc), n
 end

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

-function layout_args(sztup::NTuple{3,I}) where I<:Integer
+function layout_args{I<:Integer}(sztup::NTuple{3,I})
    n, nr, nc = sztup
    nr, nc = compute_gridsize(n, nr, nc)
    GridLayout(nr, nc), n
@@ -712,7 +704,7 @@ function link_axes!(axes::Axis...)
    a1 = axes[1]
    for i=2:length(axes)
        a2 = axes[i]
-        expand_extrema!(a1, ignorenan_extrema(a2))
+        expand_extrema!(a1, extrema(a2))
        for k in (:extrema, :discrete_values, :continuous_values, :discrete_map)
            a2[k] = a1[k]
        end
@@ -39,7 +39,7 @@ 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)
+  writemime(io, MIME("image/eps"), plt)
  close(io)
 end
 eps(fn::AbstractString) = eps(current(), fn)
@@ -97,13 +97,6 @@ function addExtension(fn::AbstractString, ext::AbstractString)
  end
 end

-"""
-    savefig([plot,] filename)
-
-Save a Plot (the current plot if `plot` is not passed) to file. The file
-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)

  # get the extension
@@ -126,11 +119,7 @@ savefig(fn::AbstractString) = savefig(current(), fn)


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

-Display a plot using the backends' gui window
-"""
 gui(plt::Plot = current()) = display(PlotsDisplay(), plt)

 # IJulia only... inline display
@@ -193,7 +182,7 @@ function Base.show(io::IO, ::MIME"text/html", plt::Plot)
    end
 end

-function _show(io::IO, m, plt::Plot{B}) where B
+function _show{B}(io::IO, m, plt::Plot{B})
    # Base.show_backtrace(STDOUT, backtrace())
    warn("_show is not defined for this backend. m=", string(m))
 end
@@ -203,13 +192,12 @@ end

 # for writing to io streams... first prepare, then callback
 for mime in keys(_mimeformats)
-    @eval function Base.show(io::IO, m::MIME{Symbol($mime)}, plt::Plot{B}) where B
+    @eval function Base.show{B}(io::IO, m::MIME{Symbol($mime)}, plt::Plot{B})
        prepare_output(plt)
        _show(io, m, plt)
    end
 end

-"Close all open gui windows of the current backend"
 closeall() = closeall(backend())


@@ -232,10 +220,14 @@ if is_installed("FileIO")
        FileIO.save(pngfn, s)

        # now write from the file
-        write(io, readstring(open(pngfn)))
+        write(io, readall(open(pngfn)))
    end
 end

+
+
+
+
 # function html_output_format(fmt)
 #     if fmt == "png"
 #         @eval function Base.show(io::IO, ::MIME"text/html", plt::Plot)
@@ -258,26 +250,27 @@ end

 const _ijulia_output = String["text/html"]

-@require IJulia begin
-    if IJulia.inited
-        export set_ijulia_output
+function setup_ijulia()
+    # override IJulia inline display
+    if isijulia()
+        @eval begin
+            import IJulia
+            export set_ijulia_output
+            function set_ijulia_output(mimestr::AbstractString)
+                # info("Setting IJulia output format to $mimestr")
+                global _ijulia_output
+                _ijulia_output[1] = mimestr
+            end
+            function IJulia.display_dict(plt::Plot)
+                global _ijulia_output
+                Dict{String, String}(_ijulia_output[1] => sprint(show, _ijulia_output[1], plt))
+            end

-        function set_ijulia_output(mimestr::AbstractString)
-            # info("Setting IJulia output format to $mimestr")
-            global _ijulia_output
-            _ijulia_output[1] = mimestr
+            # default text/plain passes to html... handles Interact issues
+            function Base.show(io::IO, m::MIME"text/plain", plt::Plot)
+                show(io, MIME("text/html"), plt)
+            end
        end
-        function IJulia.display_dict(plt::Plot)
-            global _ijulia_output
-            Dict{String, String}(_ijulia_output[1] => sprint(show, _ijulia_output[1], plt))
-        end
-
-        # default text/plain passes to html... handles Interact issues
-        function Base.show(io::IO, m::MIME"text/plain", plt::Plot)
-            show(io, MIME("text/html"), plt)
-        end
-
-        ENV["MPLBACKEND"] = "Agg"
        set_ijulia_output("text/html")
    end
 end
@@ -285,48 +278,50 @@ end
 # ---------------------------------------------------------
 # Atom PlotPane
 # ---------------------------------------------------------
-@require Juno begin
-    import Hiccup, Media

-    if Juno.isactive()
+function setup_atom()
+    if isatom()
+        @eval import Atom, Media
        Media.media(Plot, Media.Plot)

+        # default text/plain so it doesn't complain
+        function Base.show{B}(io::IO, ::MIME"text/plain", plt::Plot{B})
+            print(io, "Plot{$B}()")
+        end

-        _show(io::IO, m::MIME"text/plain", plt::Plot{B}) where {B} = print(io, "Plot{$B}()")
-
-        function Juno.render(e::Juno.Editor, plt::Plot)
-            Juno.render(e, nothing)
+        function Media.render(e::Atom.Editor, plt::Plot)
+            Media.render(e, nothing)
        end

        if get(ENV, "PLOTS_USE_ATOM_PLOTPANE", true) in (true, 1, "1", "true", "yes")
-            function Juno.render(pane::Juno.PlotPane, plt::Plot)
+            # this is like "display"... sends an html div with the plot to the PlotPane
+            function Media.render(pane::Atom.PlotPane, plt::Plot)
                # temporarily overwrite size to be Atom.plotsize
                sz = plt[:size]
-                jsize = Juno.plotsize()
-                jsize[1] == 0 && (jsize[1] = 400)
-                jsize[2] == 0 && (jsize[2] = 500)
-
-                plt[:size] = jsize
-                Juno.render(pane, HTML(stringmime(MIME("text/html"), plt)))
+                plt[:size] = Juno.plotsize()
+                Media.render(pane, Atom.div(".fill", Atom.HTML(stringmime(MIME("text/html"), plt))))
                plt[:size] = sz
            end
-            # special handling for PlotlyJS
-            function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyJSBackend})
-                display(Plots.PlotsDisplay(), plt)
-            end
        else
-            function Juno.render(pane::Juno.PlotPane, plt::Plot)
+            #
+            function Media.render(pane::Atom.PlotPane, plt::Plot)
                display(Plots.PlotsDisplay(), plt)
                s = "PlotPane turned off.  Unset ENV[\"PLOTS_USE_ATOM_PLOTPANE\"] and restart Julia to enable it."
-                Juno.render(pane, HTML(s))
+                Media.render(pane, Atom.div(Atom.HTML(s)))
            end
        end

        # special handling for plotly... use PlotsDisplay
-        function Juno.render(pane::Juno.PlotPane, plt::Plot{PlotlyBackend})
+        function Media.render(pane::Atom.PlotPane, plt::Plot{PlotlyBackend})
            display(Plots.PlotsDisplay(), plt)
-            s = "PlotPane turned off.  The plotly backend cannot render in the PlotPane due to javascript issues. Plotlyjs is similar to plotly and is compatible with the plot pane."
-            Juno.render(pane, HTML(s))
+            s = "PlotPane turned off.  The plotly and plotlyjs backends cannot render in the PlotPane due to javascript issues."
+            Media.render(pane, Atom.div(Atom.HTML(s)))
+        end
+
+        # special handling for PlotlyJS to pass through to that render method
+        function Media.render(pane::Atom.PlotPane, plt::Plot{PlotlyJSBackend})
+            Plots.prepare_output(plt)
+            Media.render(pane, plt.o)
        end
    end
 end
@@ -60,26 +60,29 @@ function _process_userrecipes(plt::Plot, d::KW, args)
    args = _preprocess_args(d, args, still_to_process)

    # 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.
+    # we are keeping a queue 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.
+    # finished (no more args) get added to the kw_list, and the rest go into the queue
+    # for processing.
    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.
+        # grab the first in line to be processed and pass it through apply_recipe
+        # to generate a list of RecipeData objects (data + attributes)
        next_series = shift!(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.d, next_series.args...)
-            prepend!(still_to_process,rd_list)
+        rd_list = RecipesBase.apply_recipe(next_series.d, next_series.args...)
+        for recipedata in rd_list
+            # recipedata should be of type RecipeData.  if it's not then the inputs must not have been fully processed by recipes
+            if !(typeof(recipedata) <: RecipeData)
+                error("Inputs couldn't be processed... expected RecipeData but got: $recipedata")
+            end
+
+            if isempty(recipedata.args)
+                _process_userrecipe(plt, kw_list, recipedata)
+            else
+                # args are non-empty, so there's still processing to do... add it back to the queue
+                push!(still_to_process, recipedata)
+            end
        end
    end

@@ -150,7 +153,7 @@ function _add_smooth_kw(kw_list::Vector{KW}, kw::KW)
    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)]
+        sx = [minimum(x), maximum(x)]
        sy = β * sx + α
        push!(kw_list, merge(copy(kw), KW(
            :seriestype => :path,
@@ -210,7 +213,7 @@ function _plot_setup(plt::Plot, d::KW, kw_list::Vector{KW})
    # TODO: init subplots here
    _update_plot_args(plt, d)
    if !plt.init
-        plt.o = Base.invokelatest(_create_backend_figure, plt)
+        plt.o = _create_backend_figure(plt)

        # create the layout and subplots from the inputs
        plt.layout, plt.subplots, plt.spmap = build_layout(plt.attr)
@@ -259,12 +262,12 @@ function _subplot_setup(plt::Plot, d::KW, kw_list::Vector{KW})
    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], command_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)
+        for (k,v) in kw
            if haskey(_subplot_defaults, k) || haskey(_axis_defaults_byletter, k)
                attr[k] = pop!(kw, k)
            end
@@ -274,13 +277,6 @@ function _subplot_setup(plt::Plot, d::KW, kw_list::Vector{KW})
                    attr[Symbol(letter,k)] = v
                end
            end
-            for k in (:scale,), letter in (:x,:y,:z)
-                # Series recipes may need access to this information
-                lk = Symbol(letter,k)
-                if haskey(attr, lk)
-                    kw[lk] = attr[lk]
-                end
-            end
        end
        sp_attrs[sp] = attr
    end
@@ -301,7 +297,7 @@ 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}, d::KW) where T
+function _prepare_subplot{T}(plt::Plot{T}, d::KW)
    st::Symbol = d[:seriestype]
    sp::Subplot{T} = d[:subplot]
    sp_idx = get_subplot_index(plt, sp)
@@ -361,14 +357,9 @@ function _expand_subplot_extrema(sp::Subplot, d::KW, st::Symbol)
        expand_extrema!(sp[:xaxis], (0,w))
        expand_extrema!(sp[:yaxis], (0,h))
        sp[:yaxis].d[:flip] = true
-    elseif !(st in (:pie, :histogram, :bins2d, :histogram2d))
+    elseif !(st in (:pie, :histogram, :histogram2d))
        expand_extrema!(sp, d)
    end
-    # expand for zerolines (axes through origin)
-    if sp[:framestyle] in (:origin, :zerolines)
-        expand_extrema!(sp[:xaxis], 0.0)
-        expand_extrema!(sp[:yaxis], 0.0)
-    end
 end

 function _add_the_series(plt, sp, d)
@@ -1,15 +1,11 @@

-mutable struct CurrentPlot
+type CurrentPlot
    nullableplot::Nullable{AbstractPlot}
 end
 const CURRENT_PLOT = CurrentPlot(Nullable{AbstractPlot}())

 isplotnull() = isnull(CURRENT_PLOT.nullableplot)

-"""
-    current()
-Returns the Plot object for the current plot
-"""
 function current()
    if isplotnull()
        error("No current plot/subplot")
@@ -33,18 +29,16 @@ convertSeriesIndex(plt::Plot, n::Int) = n


 """
-The main plot command. Use `plot` to create a new plot object, and `plot!` to add to an existing one:
+The main plot command.  Use `plot` to create a new plot object, and `plot!` to mutate an existing one:

 ```
-    plot(args...; kw...)                  # creates a new plot window, and sets it to be the current
-    plot!(args...; kw...)                 # adds to the `current`
-    plot!(plotobj, args...; kw...)        # adds to the plot `plotobj`
+    plot(args...; kw...)                  # creates a new Plot, and sets it to be the current
+    plot!(args...; kw...)                 # adds to the `current` Plot
+    plot!(plotobj, args...; kw...)        # adds to the Plot `plotobj`
 ```

 There are lots of ways to pass in data, and lots of keyword arguments... just try it and it will likely work as expected.
-When you pass in matrices, it splits by columns. To see the list of available attributes, use the `plotattr([attr])`
-function, where `attr` is the symbol `:Series:`, `:Subplot:`, `:Plot` or `:Axis`. Pass any attribute to `plotattr`
-as a String to look up its docstring; e.g. `plotattr("seriestype")`.
+When you pass in matrices, it splits by columns.  See the documentation for more info.
 """

 # this creates a new plot with args/kw and sets it to be the current plot
@@ -66,7 +60,7 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)

    # build our plot vector from the args
    n = length(plts_tail) + 1
-    plts = Array{Plot}(n)
+    plts = Array(Plot, n)
    plts[1] = plt1
    for (i,plt) in enumerate(plts_tail)
        plts[i+1] = plt
@@ -86,7 +80,7 @@ function plot(plt1::Plot, plts_tail::Plot...; kw...)
    # TODO: replace this with proper processing from a merged user_attr KW
    # update plot args, first with existing plots, then override with d
    for p in plts
-        _update_plot_args(plt, copy(p.attr))
+        _update_plot_args(plt, p.attr)
        plt.n += p.n
    end
    _update_plot_args(plt, d)
@@ -1,62 +0,0 @@
-
-const _attribute_defaults =  Dict(:Series => _series_defaults,
-                        :Subplot => _subplot_defaults,
-                        :Plot => _plot_defaults,
-                        :Axis => _axis_defaults)
-
-attrtypes() = join(keys(_attribute_defaults), ", ")
-attributes(attrtype::Symbol) = sort(collect(keys(_attribute_defaults[attrtype])))
-
-function lookup_aliases(attrtype, attribute)
-    attribute = Symbol(attribute)
-    attribute = in(attribute, keys(_keyAliases)) ? _keyAliases[attribute] : attribute
-    in(attribute, keys(_attribute_defaults[attrtype])) && return attribute
-    error("There is no attribute named $attribute in $attrtype")
-end
-
-"""
-    plotattr([attr])
-
-Look up the properties of a Plots attribute, or specify an attribute type. Call `plotattr()` for options.
-The information is the same as that given on https://juliaplots.github.io/attributes/.
-"""
-function plotattr()
-    println("Specify an attribute type to get a list of supported attributes. Options are $(attrtypes())")
-end
-
-function plotattr(attrtype::Symbol)
-    in(attrtype, keys(_attribute_defaults)) || error("Viable options are $(attrtypes())")
-    println("Defined $attrtype attributes are:\n$(join(attributes(attrtype), ", "))")
-end
-
-function plotattr(attribute::AbstractString)
-    attribute = Symbol(attribute)
-    attribute = in(attribute, keys(_keyAliases)) ? _keyAliases[attribute] : attribute
-    for (k, v) in _attribute_defaults
-        if in(attribute, keys(v))
-            return plotattr(k, "$attribute")
-        end
-    end
-    error("There is no attribute named $attribute")
-end
-
-function plotattr(attrtype::Symbol, attribute::AbstractString)
-    in(attrtype, keys(_attribute_defaults)) || ArgumentError("`attrtype` must match one of $(attrtypes())")
-
-    attribute = Symbol(lookup_aliases(attrtype, attribute))
-
-    desc = get(_arg_desc, attribute, "")
-    first_period_idx = findfirst(desc, '.')
-    typedesc = desc[1:first_period_idx-1]
-    desc = strip(desc[first_period_idx+1:end])
-    als = keys(filter((_,v)->v==attribute, _keyAliases)) |> collect |> sort
-    als = join(map(string,als), ", ")
-    def = _attribute_defaults[attrtype][attribute]
-
-
-    # Looks up the different elements and plots them
-    println("$attribute ", typedesc == "" ? "" : "{$typedesc}", "\n",
-        als == "" ? "" : "$als\n",
-        "\n$desc\n",
-        "$(attrtype) attribute, ", def == "" ? "" : " default: $def")
-end
@@ -1,4 +1,53 @@

+
+
+"""
+You can easily define your own plotting recipes with convenience methods:
+
+```
+@userplot type GroupHist
+    args
+end
+
+@recipe function f(gh::GroupHist)
+    # set some attributes, add some series, using gh.args as input
+end
+
+# now you can plot like:
+grouphist(rand(1000,4))
+```
+"""
+macro userplot(expr)
+    _userplot(expr)
+end
+
+function _userplot(expr::Expr)
+    if expr.head != :type
+        errror("Must call userplot on a type/immutable expression.  Got: $expr")
+    end
+
+    typename = expr.args[2]
+    funcname = Symbol(lowercase(string(typename)))
+    funcname2 = Symbol(funcname, "!")
+
+    # return a code block with the type definition and convenience plotting methods
+    esc(quote
+        $expr
+        export $funcname, $funcname2
+        $funcname(args...; kw...) = plot($typename(args); kw...)
+        $funcname2(args...; kw...) = plot!($typename(args); kw...)
+    end)
+end
+
+function _userplot(sym::Symbol)
+    _userplot(:(type $sym
+            args
+    end))
+end
+
+
+# ----------------------------------------------------------------------------------
+
 const _series_recipe_deps = Dict()

 function series_recipe_dependencies(st::Symbol, deps::Symbol...)
@@ -47,7 +96,7 @@ end
 num_series(x::AMat) = size(x,2)
 num_series(x) = 1

-RecipesBase.apply_recipe(d::KW, ::Type{T}, plt::AbstractPlot) where {T} = throw(MethodError("Unmatched plot recipe: $T"))
+RecipesBase.apply_recipe{T}(d::KW, ::Type{T}, plt::Plot) = throw(MethodError("Unmatched plot recipe: $T"))

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

@@ -79,7 +128,7 @@ function hvline_limits(axis::Axis)
 end

@recipe function f(::Type{Val{:hline}}, x, y, z)
-    xmin, xmax = hvline_limits(plotattributes[:subplot][:xaxis])
+    xmin, xmax = hvline_limits(d[:subplot][:xaxis])
    n = length(y)
    newx = repmat(Float64[xmin, xmax, NaN], n)
    newy = vec(Float64[yi for i=1:3,yi=y])
@@ -91,7 +140,7 @@ end
@deps hline path

@recipe function f(::Type{Val{:vline}}, x, y, z)
-    ymin, ymax = hvline_limits(plotattributes[:subplot][:yaxis])
+    ymin, ymax = hvline_limits(d[:subplot][:yaxis])
    n = length(y)
    newx = vec(Float64[yi for i=1:3,yi=y])
    newy = repmat(Float64[ymin, ymax, NaN], n)
@@ -102,25 +151,6 @@ end
 end
@deps vline path

-# ---------------------------------------------------------------------------
-# path and scatter
-
-# create a path from steps
-@recipe function f(::Type{Val{:scatterpath}}, x, y, z)
-    x := x
-    y := y
-    seriestype := :scatter
-    @series begin
-        seriestype := :path
-        label := ""
-        primary := false
-        ()
-    end
-()
-end
-@deps scatterpath path scatter
-
-
 # ---------------------------------------------------------------------------
 # steps

@@ -142,11 +172,11 @@ end

 # create a path from steps
@recipe function f(::Type{Val{:steppre}}, x, y, z)
-    plotattributes[:x], plotattributes[:y] = make_steps(x, y, :steppre)
+    d[:x], d[:y] = make_steps(x, y, :steppre)
    seriestype := :path

    # create a secondary series for the markers
-    if plotattributes[:markershape] != :none
+    if d[:markershape] != :none
        @series begin
            seriestype := :scatter
            x := x
@@ -163,11 +193,11 @@ end

 # create a path from steps
@recipe function f(::Type{Val{:steppost}}, x, y, z)
-    plotattributes[:x], plotattributes[:y] = make_steps(x, y, :steppost)
+    d[:x], d[:y] = make_steps(x, y, :steppost)
    seriestype := :path

    # create a secondary series for the markers
-    if plotattributes[:markershape] != :none
+    if d[:markershape] != :none
        @series begin
            seriestype := :scatter
            x := x
@@ -189,20 +219,20 @@ end
 # create vertical line segments from fill
@recipe function f(::Type{Val{:sticks}}, x, y, z)
    n = length(x)
-    fr = plotattributes[:fillrange]
+    fr = d[:fillrange]
    if fr == nothing
-        yaxis = plotattributes[:subplot][:yaxis]
+        yaxis = d[:subplot][:yaxis]
        fr = if yaxis[:scale] == :identity
            0.0
        else
-            NaNMath.min(axis_limits(yaxis)[1], ignorenan_minimum(y))
+            min(axis_limits(yaxis)[1], minimum(y))
        end
    end
    newx, newy = zeros(3n), zeros(3n)
    for i=1:n
        rng = 3i-2:3i
        newx[rng] = [x[i], x[i], NaN]
-        newy[rng] = [_cycle(fr,i), y[i], NaN]
+        newy[rng] = [cycle(fr,i), y[i], NaN]
    end
    x := newx
    y := newy
@@ -210,7 +240,7 @@ end
    seriestype := :path

    # create a secondary series for the markers
-    if plotattributes[:markershape] != :none
+    if d[:markershape] != :none
        @series begin
            seriestype := :scatter
            x := x
@@ -243,7 +273,7 @@ end
@recipe function f(::Type{Val{:curves}}, x, y, z; npoints = 30)
    args = z != nothing ? (x,y,z) : (x,y)
    newx, newy = zeros(0), zeros(0)
-    fr = plotattributes[:fillrange]
+    fr = d[:fillrange]
    newfr = fr != nothing ? zeros(0) : nothing
    newz = z != nothing ? zeros(0) : nothing
    # lz = d[:line_z]
@@ -254,16 +284,16 @@ end
    for rng in iter_segments(args...)
        length(rng) < 2 && continue
        ts = linspace(0, 1, npoints)
-        nanappend!(newx, map(t -> bezier_value(_cycle(x,rng), t), ts))
-        nanappend!(newy, map(t -> bezier_value(_cycle(y,rng), t), ts))
+        nanappend!(newx, map(t -> bezier_value(cycle(x,rng), t), ts))
+        nanappend!(newy, map(t -> bezier_value(cycle(y,rng), t), ts))
        if z != nothing
-            nanappend!(newz, map(t -> bezier_value(_cycle(z,rng), t), ts))
+            nanappend!(newz, map(t -> bezier_value(cycle(z,rng), t), ts))
        end
        if fr != nothing
-            nanappend!(newfr, map(t -> bezier_value(_cycle(fr,rng), t), ts))
+            nanappend!(newfr, map(t -> bezier_value(cycle(fr,rng), t), ts))
        end
        # if lz != nothing
-        #     lzrng = _cycle(lz, rng) # the line_z's for this segment
+        #     lzrng = cycle(lz, rng) # the line_z's for this segment
        #     push!(newlz, 0.0)
        #     append!(newlz, map(t -> lzrng[1+floor(Int, t * (length(rng)-1))], ts))
        # end
@@ -293,11 +323,10 @@ end

 # create a bar plot as a filled step function
@recipe function f(::Type{Val{:bar}}, x, y, z)
-    procx, procy, xscale, yscale, baseline = _preprocess_barlike(plotattributes, x, y)
-    nx, ny = length(procx), length(procy)
-    axis = plotattributes[:subplot][isvertical(plotattributes) ? :xaxis : :yaxis]
-    cv = [discrete_value!(axis, xi)[1] for xi=procx]
-    procx = if nx == ny
+    nx, ny = length(x), length(y)
+    axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis]
+    cv = [discrete_value!(axis, xi)[1] for xi=x]
+    x = if nx == ny
        cv
    elseif nx == ny + 1
        0.5diff(cv) + cv[1:end-1]
@@ -306,40 +335,35 @@ end
    end

    # compute half-width of bars
-    bw = plotattributes[:bar_width]
+    bw = d[:bar_width]
    hw = if bw == nothing
-        0.5*_bar_width*ignorenan_minimum(filter(x->x>0, diff(procx)))
+        0.5mean(diff(x))
    else
-        Float64[0.5_cycle(bw,i) for i=1:length(procx)]
+        Float64[0.5cycle(bw,i) for i=1:length(x)]
    end

    # make fillto a vector... default fills to 0
-    fillto = plotattributes[:fillrange]
+    fillto = d[:fillrange]
    if fillto == nothing
        fillto = 0
    end
-    if (yscale in _logScales) && !all(_is_positive, fillto)
-        fillto = map(x -> _is_positive(x) ? typeof(baseline)(x) : baseline, fillto)
-    end

    # create the bar shapes by adding x/y segments
    xseg, yseg = Segments(), Segments()
    for i=1:ny
-        yi = procy[i]
-        if !isnan(yi)
-            center = procx[i]
-            hwi = _cycle(hw,i)
-            fi = _cycle(fillto,i)
-            push!(xseg, center-hwi, center-hwi, center+hwi, center+hwi, center-hwi)
-            push!(yseg, yi, fi, fi, yi, yi)
-        end
+        center = x[i]
+        hwi = cycle(hw,i)
+        yi = y[i]
+        fi = cycle(fillto,i)
+        push!(xseg, center-hwi, center-hwi, center+hwi, center+hwi, center-hwi)
+        push!(yseg, yi, fi, fi, yi, yi)
    end

    # widen limits out a bit
-    expand_extrema!(axis, widen(ignorenan_extrema(xseg.pts)...))
+    expand_extrema!(axis, widen(extrema(xseg.pts)...))

    # switch back
-    if !isvertical(plotattributes)
+    if !isvertical(d)
        xseg, yseg = yseg, xseg
    end

@@ -354,333 +378,106 @@ end
 end
@deps bar shape

-
 # ---------------------------------------------------------------------------
 # Histograms

-_bin_centers(v::AVec) = (v[1:end-1] + v[2:end]) / 2
-
-_is_positive(x) = (x > 0) && !(x ≈ 0)
-
-_positive_else_nan(::Type{T}, x::Real) where {T} = _is_positive(x) ? T(x) : T(NaN)
-
-function _scale_adjusted_values(::Type{T}, V::AbstractVector, scale::Symbol) where T<:AbstractFloat
-    if scale in _logScales
-        [_positive_else_nan(T, x) for x in V]
-    else
-        [T(x) for x in V]
-    end
+# edges from number of bins
+function calc_edges(v, bins::Integer)
+    vmin, vmax = extrema(v)
+    linspace(vmin, vmax, bins+1)
 end

+# just pass through arrays
+calc_edges(v, bins::AVec) = bins

-function _binbarlike_baseline(min_value::T, scale::Symbol) where T<:Real
-    if (scale in _logScales)
-        !isnan(min_value) ? min_value / T(_logScaleBases[scale]^log10(2)) : T(1E-3)
-    else
-        zero(T)
-    end
-end
-
-
-function _preprocess_binbarlike_weights(::Type{T}, w, wscale::Symbol) where T<:AbstractFloat
-    w_adj = _scale_adjusted_values(T, w, wscale)
-    w_min = ignorenan_minimum(w_adj)
-    w_max = ignorenan_maximum(w_adj)
-    baseline = _binbarlike_baseline(w_min, wscale)
-    w_adj, baseline
-end
-
-function _preprocess_barlike(d, x, y)
-    xscale = get(d, :xscale, :identity)
-    yscale = get(d, :yscale, :identity)
-    weights, baseline = _preprocess_binbarlike_weights(float(eltype(y)), y, yscale)
-    x, weights, xscale, yscale, baseline
-end
-
-function _preprocess_binlike(d, x, y)
-    xscale = get(d, :xscale, :identity)
-    yscale = get(d, :yscale, :identity)
-    T = float(promote_type(eltype(x), eltype(y)))
-    edge = T.(x)
-    weights, baseline = _preprocess_binbarlike_weights(T, y, yscale)
-    edge, weights, xscale, yscale, baseline
-end
-
-
-@recipe function f(::Type{Val{:barbins}}, x, y, z)
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
-    if (plotattributes[:bar_width] == nothing)
-        bar_width := diff(edge)
-    end
-    x := _bin_centers(edge)
-    y := weights
-    seriestype := :bar
-    ()
-end
-@deps barbins bar
-
-
-@recipe function f(::Type{Val{:scatterbins}}, x, y, z)
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
-    xerror := diff(edge)/2
-    x := _bin_centers(edge)
-    y := weights
-    seriestype := :scatter
-    ()
-end
-@deps scatterbins scatter
-
-
-function _stepbins_path(edge, weights, baseline::Real, xscale::Symbol, yscale::Symbol)
-    log_scale_x = xscale in _logScales
-    log_scale_y = yscale in _logScales
-
-    nbins = length(linearindices(weights))
-    if length(linearindices(edge)) != nbins + 1
-        error("Edge vector must be 1 longer than weight vector")
-    end
-
-    x = eltype(edge)[]
-    y = eltype(weights)[]
-
-    it_e, it_w = start(edge), start(weights)
-    a, it_e = next(edge, it_e)
-    last_w = eltype(weights)(NaN)
-    i = 1
-    while (!done(edge, it_e) && !done(edge, it_e))
-        b, it_e = next(edge, it_e)
-        w, it_w = next(weights, it_w)
-
-        if (log_scale_x && a ≈ 0)
-            a = b/_logScaleBases[xscale]^3
+# find the bucket index of this value
+function bucket_index(vi, edges)
+    for (i,e) in enumerate(edges)
+        if vi <= e
+            return max(1,i-1)
        end
-
-        if isnan(w)
-            if !isnan(last_w)
-                push!(x, a)
-                push!(y, baseline)
-            end
-        else
-            if isnan(last_w)
-                push!(x, a)
-                push!(y, baseline)
-            end
-            push!(x, a)
-            push!(y, w)
-            push!(x, b)
-            push!(y, w)
-        end
-
-        a = b
-        last_w = w
    end
-    if (last_w != baseline)
-        push!(x, a)
-        push!(y, baseline)
-    end
-
-    (x, y)
+    return length(edges)-1
 end

+function my_hist(v, bins; normed = false, weights = nothing)
+    edges = calc_edges(v, bins)
+    counts = zeros(length(edges)-1)

-@recipe function f(::Type{Val{:stepbins}}, x, y, z)
-    axis = plotattributes[:subplot][Plots.isvertical(plotattributes) ? :xaxis : :yaxis]
-
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, x, y)
-
-    xpts, ypts = _stepbins_path(edge, weights, baseline, xscale, yscale)
-    if !isvertical(plotattributes)
-        xpts, ypts = ypts, xpts
+    # add a weighted count
+    for (i,vi) in enumerate(v)
+        idx = bucket_index(vi, edges)
+        counts[idx] += (weights == nothing ? 1.0 : weights[i])
    end

-    # create a secondary series for the markers
-    if plotattributes[:markershape] != :none
-        @series begin
-            seriestype := :scatter
-            x := _bin_centers(edge)
-            y := weights
-            fillrange := nothing
-            label := ""
-            primary := false
-            ()
-        end
-        markershape := :none
-        xerror := :none
-        yerror := :none
+    # normalize by bar area?
+    norm_denom = normed ? sum(diff(edges) .* counts) : 1.0
+    if norm_denom == 0
+        norm_denom = 1.0
    end

-    x := xpts
-    y := ypts
-    seriestype := :path
-    ()
-end
-Plots.@deps stepbins path
-
-wand_edges(x...) = (warn("Load the StatPlots package in order to use :wand bins. Defaulting to :auto", once = true); :auto)
-
-function _auto_binning_nbins(vs::NTuple{N,AbstractVector}, dim::Integer; mode::Symbol = :auto) where N
-    _cl(x) = ceil(Int, NaNMath.max(x, one(x)))
-    _iqr(v) = (q = quantile(v, 0.75) - quantile(v, 0.25); q > 0 ? q : oftype(q, 1))
-    _span(v) = ignorenan_maximum(v) - ignorenan_minimum(v)
-
-    n_samples = length(linearindices(first(vs)))
-
-    # The nd estimator is the key to most automatic binning methods, and is modified for twodimensional histograms to include correlation
-    nd = n_samples^(1/(2+N))
-    nd = N == 2 ? nd / (1-cor(first(vs), last(vs))^2)^(3//8) : nd # the >2-dimensional case does not have a nice solution to correlations
-
-    v = vs[dim]
-
-    if mode == :auto
-        mode = :fd
-    end
-
-    if mode == :sqrt  # Square-root choice
-        _cl(sqrt(n_samples))
-    elseif mode == :sturges  # Sturges' formula
-        _cl(log2(n_samples) + 1)
-    elseif mode == :rice  # Rice Rule
-        _cl(2 * nd)
-    elseif mode == :scott  # Scott's normal reference rule
-        _cl(_span(v) / (3.5 * std(v) / nd))
-    elseif mode == :fd  # Freedman–Diaconis rule
-        _cl(_span(v) / (2 * _iqr(v) / nd))
-    elseif mode == :wand
-        wand_edges(v)  # this makes this function not type stable, but the type instability does not propagate
-    else
-        error("Unknown auto-binning mode $mode")
-    end
-end
-
-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Integer) where {N} = StatsBase.histrange(vs[dim], binning, :left)
-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Symbol) where {N} = _hist_edge(vs, dim, _auto_binning_nbins(vs, dim, mode = binning))
-_hist_edge(vs::NTuple{N,AbstractVector}, dim::Integer, binning::AbstractVector) where {N} = binning
-
-_hist_edges(vs::NTuple{N,AbstractVector}, binning::NTuple{N}) where {N} =
-    map(dim -> _hist_edge(vs, dim, binning[dim]), (1:N...))
-
-_hist_edges(vs::NTuple{N,AbstractVector}, binning::Union{Integer, Symbol, AbstractVector}) where {N} =
-    map(dim -> _hist_edge(vs, dim, binning), (1:N...))
-
-_hist_norm_mode(mode::Symbol) = mode
-_hist_norm_mode(mode::Bool) = mode ? :pdf : :none
-
-function _make_hist(vs::NTuple{N,AbstractVector}, binning; normed = false, weights = nothing) where N
-    edges = _hist_edges(vs, binning)
-    h = float( weights == nothing ?
-        StatsBase.fit(StatsBase.Histogram, vs, edges, closed = :left) :
-        StatsBase.fit(StatsBase.Histogram, vs, StatsBase.Weights(weights), edges, closed = :left)
-    )
-    normalize!(h, mode = _hist_norm_mode(normed))
+    edges, counts ./ norm_denom
 end


@recipe function f(::Type{Val{:histogram}}, x, y, z)
-    seriestype := length(y) > 1e6 ? :stephist : :barhist
+    edges, counts = my_hist(y, d[:bins],
+                               normed = d[:normalize],
+                               weights = d[:weights])
+    x := edges
+    y := counts
+    seriestype := :bar
    ()
 end
-@deps histogram barhist
-
-@recipe function f(::Type{Val{:barhist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
-    x := h.edges[1]
-    y := h.weights
-    seriestype := :barbins
-    ()
-end
-@deps barhist barbins
-
-@recipe function f(::Type{Val{:stephist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
-    x := h.edges[1]
-    y := h.weights
-    seriestype := :stepbins
-    ()
-end
-@deps stephist stepbins
-
-@recipe function f(::Type{Val{:scatterhist}}, x, y, z)
-    h = _make_hist((y,), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
-    x := h.edges[1]
-    y := h.weights
-    seriestype := :scatterbins
-    ()
-end
-@deps scatterhist scatterbins
-
-
-@recipe function f(h::StatsBase.Histogram{T, 1, E}) where {T, E}
-    seriestype --> :barbins
-
-    st_map = Dict(
-        :bar => :barbins, :scatter => :scatterbins, :step => :stepbins,
-        :steppost => :stepbins # :step can be mapped to :steppost in pre-processing
-    )
-    seriestype := get(st_map, plotattributes[:seriestype], plotattributes[:seriestype])
-
-    if plotattributes[:seriestype] == :scatterbins
-        # Workaround, error bars currently not set correctly by scatterbins
-        edge, weights, xscale, yscale, baseline = _preprocess_binlike(plotattributes, h.edges[1], h.weights)
-        xerror --> diff(h.edges[1])/2
-        seriestype := :scatter
-        (Plots._bin_centers(edge), weights)
-    else
-        (h.edges[1], h.weights)
-    end
-end
-
-
-@recipe function f(hv::AbstractVector{H}) where H <: StatsBase.Histogram
-    for h in hv
-        @series begin
-            h
-        end
-    end
-end
-
+@deps histogram bar

 # ---------------------------------------------------------------------------
 # Histogram 2D

-@recipe function f(::Type{Val{:bins2d}}, x, y, z)
-    edge_x, edge_y, weights = x, y, z.surf
+# if tuple, map out bins, otherwise use the same for both
+calc_edges_2d(x, y, bins) = calc_edges(x, bins), calc_edges(y, bins)
+calc_edges_2d{X,Y}(x, y, bins::Tuple{X,Y}) = calc_edges(x, bins[1]), calc_edges(y, bins[2])

-    float_weights = float(weights)
-    if float_weights === weights
-        float_weights = deepcopy(float_weights)
+# the 2D version
+function my_hist_2d(x, y, bins; normed = false, weights = nothing)
+    xedges, yedges = calc_edges_2d(x, y, bins)
+    counts = zeros(length(yedges)-1, length(xedges)-1)
+
+    # add a weighted count
+    for i=1:length(x)
+        r = bucket_index(y[i], yedges)
+        c = bucket_index(x[i], xedges)
+        counts[r,c] += (weights == nothing ? 1.0 : weights[i])
    end
-    for (i, c) in enumerate(float_weights)
+
+    # normalize to cubic area of the imaginary surface towers
+    norm_denom = normed ? sum((diff(yedges) * diff(xedges)') .* counts) : 1.0
+    if norm_denom == 0
+        norm_denom = 1.0
+    end
+
+    xedges, yedges, counts ./ norm_denom
+end
+
+centers(v::AVec) = 0.5 * (v[1:end-1] + v[2:end])
+
+@recipe function f(::Type{Val{:histogram2d}}, x, y, z)
+    xedges, yedges, counts = my_hist_2d(x, y, d[:bins],
+                                              normed = d[:normalize],
+                                              weights = d[:weights])
+    for (i,c) in enumerate(counts)
        if c == 0
-            float_weights[i] = NaN
+            counts[i] = NaN
        end
    end
-
-    x := Plots._bin_centers(edge_x)
-    y := Plots._bin_centers(edge_y)
-    z := Surface(float_weights)
-
-    match_dimensions := true
+    x := centers(xedges)
+    y := centers(yedges)
+    z := Surface(counts)
+    linewidth := 0
    seriestype := :heatmap
    ()
 end
-Plots.@deps bins2d heatmap
-
-
-@recipe function f(::Type{Val{:histogram2d}}, x, y, z)
-    h = _make_hist((x, y), plotattributes[:bins], normed = plotattributes[:normalize], weights = plotattributes[:weights])
-    x := h.edges[1]
-    y := h.edges[2]
-    z := Surface(h.weights)
-    seriestype := :bins2d
-    ()
-end
-@deps histogram2d bins2d
-
-
-@recipe function f(h::StatsBase.Histogram{T, 2, E}) where {T, E}
-    seriestype --> :bins2d
-    (h.edges[1], h.edges[2], Surface(h.weights))
-end
+@deps histogram2d heatmap


 # ---------------------------------------------------------------------------
@@ -688,7 +485,7 @@ end

@recipe function f(::Type{Val{:scatter3d}}, x, y, z)
    seriestype := :path3d
-    if plotattributes[:markershape] == :none
+    if d[:markershape] == :none
        markershape := :circle
    end
    linewidth := 0
@@ -729,12 +526,12 @@ end

 function error_coords(xorig, yorig, ebar)
    # init empty x/y, and zip errors if passed Tuple{Vector,Vector}
-    x, y = Array{float_extended_type(xorig)}(0), Array{Float64}(0)
+    x, y = Array(float_extended_type(xorig), 0), Array(Float64, 0)
    # for each point, create a line segment from the bottom to the top of the errorbar
    for i = 1:max(length(xorig), length(yorig))
-        xi = _cycle(xorig, i)
-        yi = _cycle(yorig, i)
-        ebi = _cycle(ebar, i)
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)
+        ebi = cycle(ebar, i)
        nanappend!(x, [xi, xi])
        e1, e2 = if istuple(ebi)
            first(ebi), last(ebi)
@@ -751,17 +548,17 @@ end
 # we will create a series of path segments, where each point represents one
 # side of an errorbar
@recipe function f(::Type{Val{:yerror}}, x, y, z)
-    error_style!(plotattributes)
+    error_style!(d)
    markershape := :hline
-    plotattributes[:x], plotattributes[:y] = error_coords(plotattributes[:x], plotattributes[:y], error_zipit(plotattributes[:yerror]))
+    d[:x], d[:y] = error_coords(d[:x], d[:y], error_zipit(d[:yerror]))
    ()
 end
@deps yerror path

@recipe function f(::Type{Val{:xerror}}, x, y, z)
-    error_style!(plotattributes)
+    error_style!(d)
    markershape := :vline
-    plotattributes[:y], plotattributes[:x] = error_coords(plotattributes[:y], plotattributes[:x], error_zipit(plotattributes[:xerror]))
+    d[:y], d[:x] = error_coords(d[:y], d[:x], error_zipit(d[:xerror]))
    ()
 end
@deps xerror path
@@ -787,11 +584,11 @@ function quiver_using_arrows(d::KW)
    x, y = zeros(0), zeros(0)
    for i = 1:max(length(xorig), length(yorig))
        # get the starting position
-        xi = _cycle(xorig, i)
-        yi = _cycle(yorig, i)
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)

        # get the velocity
-        vi = _cycle(velocity, i)
+        vi = cycle(velocity, i)
        vx, vy = if istuple(vi)
            first(vi), last(vi)
        elseif isscalar(vi)
@@ -824,12 +621,12 @@ function quiver_using_hack(d::KW)
    for i = 1:max(length(xorig), length(yorig))

        # get the starting position
-        xi = _cycle(xorig, i)
-        yi = _cycle(yorig, i)
+        xi = cycle(xorig, i)
+        yi = cycle(yorig, i)
        p = P2(xi, yi)

        # get the velocity
-        vi = _cycle(velocity, i)
+        vi = cycle(velocity, i)
        vx, vy = if istuple(vi)
            first(vi), last(vi)
        elseif isscalar(vi)
@@ -860,9 +657,9 @@ end
 # function apply_series_recipe(d::KW, ::Type{Val{:quiver}})
@recipe function f(::Type{Val{:quiver}}, x, y, z)
    if :arrow in supported_attrs()
-        quiver_using_arrows(plotattributes)
+        quiver_using_arrows(d)
    else
-        quiver_using_hack(plotattributes)
+        quiver_using_hack(d)
    end
    ()
 end
@@ -873,8 +670,7 @@ end

 # TODO: move OHLC to PlotRecipes finance.jl

-"Represent Open High Low Close data (used in finance)"
-mutable struct OHLC{T<:Real}
+type OHLC{T<:Real}
  open::T
  high::T
  low::T
@@ -897,7 +693,7 @@ end

 # get the joined vector
 function get_xy(v::AVec{OHLC}, x = 1:length(v))
-    xdiff = 0.3ignorenan_mean(abs.(diff(x)))
+    xdiff = 0.3mean(abs(diff(x)))
    x_out, y_out = zeros(0), zeros(0)
    for (i,ohlc) in enumerate(v)
        ox,oy = get_xy(ohlc, x[i], xdiff)
@@ -913,10 +709,10 @@ end

 # to squash ambiguity warnings...
@recipe f(x::AVec{Function}, v::AVec{OHLC}) = error()
-@recipe f(x::AVec{Function}, v::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = error()
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(x::AVec{Function}, v::AVec{Tuple{R1,R2,R3,R4}}) = error()

 # this must be OHLC?
-@recipe f(x::AVec, ohlc::AVec{Tuple{R1,R2,R3,R4}}) where {R1<:Number,R2<:Number,R3<:Number,R4<:Number} = x, OHLC[OHLC(t...) for t in ohlc]
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(x::AVec, ohlc::AVec{Tuple{R1,R2,R3,R4}}) = x, OHLC[OHLC(t...) for t in ohlc]

@recipe function f(x::AVec, v::AVec{OHLC})
    seriestype := :path
@@ -938,7 +734,7 @@ end

 # "Sparsity plot... heatmap of non-zero values of a matrix"
 # function spy{T<:Real}(z::AMat{T}; kw...)
-#     mat = reshape(map(zi->float(zi!=0), z),1,:)
+#     mat = map(zi->float(zi!=0), z)'
 #     xn, yn = size(mat)
 #     heatmap(mat; leg=false, yflip=true, aspect_ratio=:equal,
 #         xlim=(0.5, xn+0.5), ylim=(0.5, yn+0.5),
@@ -954,10 +750,6 @@ end
    @assert length(g.args) == 1 && typeof(g.args[1]) <: AbstractMatrix
    seriestype := :spy
    mat = g.args[1]
-    if length(unique(mat[mat .!= 0])) < 2
-        legend --> nothing
-        seriescolor --> cgrad([invisible(), fg_color(plotattributes)])
-    end
    n,m = size(mat)
    Plots.SliceIt, 1:m, 1:n, Surface(mat)
 end
@@ -965,31 +757,30 @@ end
@recipe function f(::Type{Val{:spy}}, x,y,z)
    yflip := true
    aspect_ratio := 1
-
    rs, cs, zs = findnz(z.surf)
-    newz = fill(NaN, size(z)...)
-
-    for i in eachindex(zs)
-        newz[rs[i],cs[i]] = zs[i]
+    xlim := extrema(cs)
+    ylim := extrema(rs)
+    if d[:markershape] == :none
+        markershape := :circle
    end
-
-    seriestype := :heatmap
-    grid --> false
-    framestyle --> :box
-
-    x := x
-    y := y
-    z := Surface(newz)
+    if d[:markersize] == default(:markersize)
+        markersize := 1
+    end
+    markerstrokewidth := 0
+    marker_z := zs
+    label := ""
+    x := cs
+    y := rs
+    z := nothing
+    seriestype := :scatter
    ()
 end

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

-"Adds a+bx... straight line over the current plot, without changing the axis limits"
+"Adds a+bx... straight line over the current plot"
 function abline!(plt::Plot, a, b; kw...)
-    xl, yl = xlims(plt), ylims(plt)
-    x1, x2 = max(xl[1], (yl[1] - b)/a), min(xl[2], (yl[2] - b)/a)
-    plot!(plt, x -> b + a*x, x1, x2; kw...)
+    plot!(plt, [extrema(plt)...], x -> b + a*x; kw...)
 end

 abline!(args...; kw...) = abline!(current(), args...; kw...)
@@ -998,70 +789,16 @@ abline!(args...; kw...) = abline!(current(), args...; kw...)
 # -------------------------------------------------
 # Dates

-dateformatter(dt) = string(Date(Dates.UTD(dt)))
-datetimeformatter(dt) = string(DateTime(Dates.UTM(dt)))
-
-@recipe f(::Type{Date}, dt::Date) = (dt -> Dates.value(dt), dateformatter)
-@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> Dates.value(dt), datetimeformatter)
+@recipe f(::Type{Date}, dt::Date) = (dt -> convert(Int,dt), dt -> string(convert(Date,dt)))
+@recipe f(::Type{DateTime}, dt::DateTime) = (dt -> convert(Int,dt), dt -> string(convert(DateTime,dt)))

 # -------------------------------------------------
 # Complex Numbers

-@recipe function f(A::Array{Complex{T}}) where T<:Number
-    xguide --> "Re(x)"
-    yguide --> "Im(x)"
-    real.(A), imag.(A)
-end
-
-# Splits a complex matrix to its real and complex parts
-# Reals defaults solid, imaginary defaults dashed
-# Label defaults are changed to match the real-imaginary reference / indexing
-@recipe function f(x::AbstractArray{T},y::Array{Complex{T2}}) where {T<:Real,T2}
-  ylabel --> "Re(y)"
-  zlabel --> "Im(y)"
-  x,real.(y),imag.(y)
-end
-
-
-# --------------------------------------------------
-# Color Gradients
-
-@userplot ShowLibrary
-@recipe function f(cl::ShowLibrary)
-    if !(length(cl.args) == 1 && isa(cl.args[1], Symbol))
-        error("showlibrary takes the name of a color library as a Symbol")
-    end
-
-    library = PlotUtils.color_libraries[cl.args[1]]
-    z = sqrt.((1:15)*reshape(1:20,1,:))
-
-    seriestype := :heatmap
-    ticks := nothing
-    legend := false
-
-    layout --> length(library.lib)
-
-    i = 0
-    for grad in sort(collect(keys(library.lib)))
-        @series begin
-            seriescolor := cgrad(grad, cl.args[1])
-            title := string(grad)
-            subplot := i += 1
-            z
-        end
-    end
-end
-
-@userplot ShowGradient
-@recipe function f(grad::ShowGradient)
-    if !(length(grad.args) == 1 && isa(grad.args[1], Symbol))
-        error("showgradient takes the name of a color gradient as a Symbol")
-    end
-    z = sqrt.((1:15)*reshape(1:20,1,:))
-    seriestype := :heatmap
-    ticks := nothing
-    legend := false
-    seriescolor := grad.args[1]
-    title := string(grad.args[1])
-    z
+@userplot ComplexPlot
+@recipe function f(cp::ComplexPlot)
+    xguide --> "Real Part"
+    yguide --> "Imaginary Part"
+    seriestype --> :scatter
+    real(cp.args[1]), imag(cp.args[1])
 end
@@ -6,13 +6,10 @@
 # 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}}
+typealias FuncOrFuncs{F} Union{F, Vector{F}, Matrix{F}}

 all3D(d::KW) = trueOrAllTrue(st -> st in (:contour, :contourf, :heatmap, :surface, :wireframe, :contour3d, :image), get(d, :seriestype, :none))

-# unknown
-convertToAnyVector(x, d::KW) = error("No user recipe defined for $(typeof(x))")
-
 # missing
 convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing

@@ -20,10 +17,10 @@ convertToAnyVector(v::Void, d::KW) = Any[nothing], nothing
 convertToAnyVector(n::Integer, d::KW) = Any[zeros(0) for i in 1:n], nothing

 # numeric vector
-convertToAnyVector(v::AVec{T}, d::KW) where {T<:Number} = Any[v], nothing
+convertToAnyVector{T<:Number}(v::AVec{T}, d::KW) = Any[v], nothing

 # string vector
-convertToAnyVector(v::AVec{T}, d::KW) where {T<:AbstractString} = Any[v], nothing
+convertToAnyVector{T<:AbstractString}(v::AVec{T}, d::KW) = Any[v], nothing

 function convertToAnyVector(v::AMat, d::KW)
    if all3D(d)
@@ -99,8 +96,8 @@ nobigs(v) = v
 end

 # not allowed
-compute_xyz(x::Void, 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::Void, y::Void, 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{F<:Function}(x::Void, y::FuncOrFuncs{F}, z)       = error("If you want to plot the function `$y`, you need to define the x values!")
+compute_xyz{F<:Function}(x::Void, y::Void, z::FuncOrFuncs{F}) = error("If you want to plot the function `$z`, you need to define x and y values!")
 compute_xyz(x::Void, y::Void, z::Void)        = error("x/y/z are all nothing!")

 # --------------------------------------------------------------------
@@ -109,7 +106,7 @@ compute_xyz(x::Void, y::Void, z::Void)        = 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
+immutable SliceIt end

 # the catch-all recipes
@recipe function f(::Type{SliceIt}, x, y, z)
@@ -128,15 +125,15 @@ struct SliceIt end
        z = z.data
    end

-    xs, _ = convertToAnyVector(x, plotattributes)
-    ys, _ = convertToAnyVector(y, plotattributes)
-    zs, _ = convertToAnyVector(z, plotattributes)
+    xs, _ = convertToAnyVector(x, d)
+    ys, _ = convertToAnyVector(y, d)
+    zs, _ = convertToAnyVector(z, d)

-    fr = pop!(plotattributes, :fillrange, nothing)
+    fr = pop!(d, :fillrange, nothing)
    fillranges, _ = if typeof(fr) <: Number
        ([fr],nothing)
    else
-        convertToAnyVector(fr, plotattributes)
+        convertToAnyVector(fr, d)
    end
    mf = length(fillranges)

@@ -148,7 +145,7 @@ struct SliceIt end
    if mx > 0 && my > 0 && mz > 0
        for i in 1:max(mx, my, mz)
            # add a new series
-            di = copy(plotattributes)
+            di = copy(d)
            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)

@@ -163,10 +160,10 @@ struct SliceIt end
 end

 # this is the default "type recipe"... just pass the object through
-@recipe f(::Type{T}, v::T) where {T<:Any} = v
+@recipe f{T<:Any}(::Type{T}, v::T) = 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.")
+@recipe f{V<:Val}(::Type{V}, x, y, z) = error("The backend must not support the series type $V, and there isn't a series recipe defined.")

 _apply_type_recipe(d, v) = RecipesBase.apply_recipe(d, typeof(v), v)[1].args[1]

@@ -174,7 +171,6 @@ _apply_type_recipe(d, v) = RecipesBase.apply_recipe(d, typeof(v), v)[1].args[1]
 # 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(d, v::AbstractArray)
-    isempty(v) && return Float64[]
    args = RecipesBase.apply_recipe(d, typeof(v[1]), v[1])[1].args
    if length(args) == 2 && typeof(args[1]) <: Function && typeof(args[2]) <: Function
        numfunc, formatter = args
@@ -201,16 +197,16 @@ end
 # end

 # don't do anything for ints or floats
-_apply_type_recipe(d, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat}} = v
+_apply_type_recipe{T<:Union{Integer,AbstractFloat}}(d, v::AbstractArray{T}) = 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)
+    newx = _apply_type_recipe(d, x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    y === newy || (did_replace = true)
-    newz = _apply_type_recipe(plotattributes, z)
+    newz = _apply_type_recipe(d, z)
    z === newz || (did_replace = true)
    if did_replace
        newx, newy, newz
@@ -220,9 +216,9 @@ _apply_type_recipe(d, v::AbstractArray{T}) where {T<:Union{Integer,AbstractFloat
 end
@recipe function f(x, y)
    did_replace = false
-    newx = _apply_type_recipe(plotattributes, x)
+    newx = _apply_type_recipe(d, x)
    x === newx || (did_replace = true)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    y === newy || (did_replace = true)
    if did_replace
        newx, newy
@@ -231,7 +227,7 @@ end
    end
 end
@recipe function f(y)
-    newy = _apply_type_recipe(plotattributes, y)
+    newy = _apply_type_recipe(d, y)
    if y !== newy
        newy
    else
@@ -244,7 +240,7 @@ end
@recipe function f(v1, v2, v3, v4, vrest...)
    did_replace = false
    newargs = map(v -> begin
-        newv = _apply_type_recipe(plotattributes, v)
+        newv = _apply_type_recipe(d, v)
        if newv !== v
            did_replace = true
        end
@@ -271,13 +267,13 @@ function wrap_surfaces(d::KW)
    end
 end

-@recipe f(n::Integer) = is3d(get(plotattributes,:seriestype,:path)) ? (SliceIt, n, n, n) : (SliceIt, n, n, nothing)
+@recipe f(n::Integer) = is3d(get(d,: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)
+@recipe function f{T<:Union{Integer,AbstractFloat}}(mat::AMat{T})
+    if all3D(d)
        n,m = size(mat)
-        wrap_surfaces(plotattributes)
+        wrap_surfaces(d)
        SliceIt, 1:m, 1:n, Surface(mat)
    else
        SliceIt, nothing, mat, nothing
@@ -285,11 +281,11 @@ 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)
+@recipe function f{T<:AbstractMatrix}(fmt::Formatted{T})
+    if all3D(d)
        mat = fmt.data
        n,m = size(mat)
-        wrap_surfaces(plotattributes)
+        wrap_surfaces(d)
        SliceIt, 1:m, 1:n, Formatted(Surface(mat), fmt.formatter)
    else
        SliceIt, nothing, fmt, nothing
@@ -297,7 +293,7 @@ end
 end

 # assume this is a Volume, so construct one
-@recipe function f(vol::AbstractArray{T,3}, args...) where T<:Number
+@recipe function f{T<:Number}(vol::AbstractArray{T,3}, args...)
    seriestype := :volume
    SliceIt, nothing, Volume(vol, args...), nothing
 end
@@ -305,10 +301,10 @@ end

 # # images - grays

-@recipe function f(mat::AMat{T}) where T<:Gray
-    n, m = size(mat)
+@recipe function f{T<:Gray}(mat::AMat{T})
    if is_seriestype_supported(:image)
        seriestype := :image
+        n, m = size(mat)
        SliceIt, 1:m, 1:n, Surface(mat)
    else
        seriestype := :heatmap
@@ -320,16 +316,15 @@ end

 # # images - colors

-@recipe function f(mat::AMat{T}) where T<:Colorant
-	n, m = size(mat)
-
+@recipe function f{T<:Colorant}(mat::AMat{T})
    if is_seriestype_supported(:image)
        seriestype := :image
+        n, m = size(mat)
        SliceIt, 1:m, 1:n, Surface(mat)
    else
        seriestype := :heatmap
        yflip --> true
-        z, plotattributes[:fillcolor] = replace_image_with_heatmap(mat)
+        z, d[:fillcolor] = replace_image_with_heatmap(mat)
        SliceIt, 1:m, 1:n, Surface(z)
    end
 end
@@ -358,36 +353,16 @@ 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]
+@recipe function f{F<:Function}(f::FuncOrFuncs{F})
+    plt = d[:plot_object]
    xmin, xmax = try
        axis_limits(plt[1][:xaxis])
    catch
-        xm = tryrange(f, [-5,-1,0,0.01])
-        xm, tryrange(f, filter(x->x>xm, [5,1,0.99, 0, -0.01]))
+        -5, 5
    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
@@ -397,7 +372,7 @@ end
 # # 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
+@recipe function f{F<:Function}(f::FuncOrFuncs{F}, x)
    F2 = typeof(x)
    @assert !(F2 <: Function || (F2 <: AbstractArray && F2.parameters[1] <: Function))  # otherwise we'd hit infinite recursion here
    x, f
@@ -428,7 +403,7 @@ end
    #         seriestype := :path3d
    #     end
    # end
-    wrap_surfaces(plotattributes)
+    wrap_surfaces(d)
    SliceIt, x, y, z
 end

@@ -438,7 +413,7 @@ end
@recipe function f(x::AVec, y::AVec, zf::Function)
    # x = X <: Number ? sort(x) : x
    # y = Y <: Number ? sort(y) : y
-    wrap_surfaces(plotattributes)
+    wrap_surfaces(d)
    SliceIt, x, y, Surface(zf, x, y)  # TODO: replace with SurfaceFunction when supported
 end

@@ -446,10 +421,10 @@ end
 # # surface-like... matrix grid

@recipe function f(x::AVec, y::AVec, z::AMat)
-    if !like_surface(get(plotattributes, :seriestype, :none))
-        plotattributes[:seriestype] = :contour
+    if !like_surface(get(d, :seriestype, :none))
+        d[:seriestype] = :contour
    end
-    wrap_surfaces(plotattributes)
+    wrap_surfaces(d)
    SliceIt, x, y, Surface(z)
 end

@@ -465,19 +440,19 @@ end
    xs = adapted_grid(f, (xmin, xmax))
    xs, f
 end
-@recipe function f(fs::AbstractArray{F}, xmin::Number, xmax::Number) where F<:Function
+@recipe function f{F<:Function}(fs::AbstractArray{F}, xmin::Number, xmax::Number)
    xs = Any[adapted_grid(f, (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, linspace(umin, umax, n)
+@recipe f{F<:Function,G<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, u::AVec)  = mapFuncOrFuncs(fx, u), mapFuncOrFuncs(fy, u)
+@recipe f{F<:Function,G<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, umin::Number, umax::Number, n = 200) = fx, fy, linspace(umin, umax, n)

 #
 # # 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}
+@recipe function f{F<:Function,G<:Function,H<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, u::AVec)
    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}
+@recipe function f{F<:Function,G<:Function,H<:Function}(fx::FuncOrFuncs{F}, fy::FuncOrFuncs{G}, fz::FuncOrFuncs{H}, umin::Number, umax::Number, numPoints = 200)
    fx, fy, fz, linspace(umin, umax, numPoints)
 end

@@ -492,28 +467,28 @@ end

 #
 # # (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]]
+@recipe f{R1<:Number,R2<:Number}(xy::AVec{Tuple{R1,R2}}) = unzip(xy)
+@recipe f{R1<:Number,R2<:Number}(xy::Tuple{R1,R2})       = [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]]
+@recipe f{R1<:Number,R2<:Number,R3<:Number}(xyz::AVec{Tuple{R1,R2,R3}}) = unzip(xyz)
+@recipe f{R1<:Number,R2<:Number,R3<:Number}(xyz::Tuple{R1,R2,R3})       = [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]]
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(xyuv::AVec{Tuple{R1,R2,R3,R4}}) = get(d,:seriestype,:path)==:ohlc ? OHLC[OHLC(t...) for t in xyuv] : unzip(xyuv)
+@recipe f{R1<:Number,R2<:Number,R3<:Number,R4<:Number}(xyuv::Tuple{R1,R2,R3,R4})       = [xyuv[1]], [xyuv[2]], [xyuv[3]], [xyuv[4]]


 #
 # # 2D FixedSizeArrays
-@recipe f(xy::AVec{FixedSizeArrays.Vec{2,T}}) where {T<:Number} = unzip(xy)
-@recipe f(xy::FixedSizeArrays.Vec{2,T}) where {T<:Number}       = [xy[1]], [xy[2]]
+@recipe f{T<:Number}(xy::AVec{StaticArrays.SVector{2,T}}) = unzip(xy)
+@recipe f{T<:Number}(xy::StaticArrays.SVector{2,T})       = [xy[1]], [xy[2]]

 #
 # # 3D FixedSizeArrays
-@recipe f(xyz::AVec{FixedSizeArrays.Vec{3,T}}) where {T<:Number} = unzip(xyz)
-@recipe f(xyz::FixedSizeArrays.Vec{3,T}) where {T<:Number}       = [xyz[1]], [xyz[2]], [xyz[3]]
+@recipe f{T<:Number}(xyz::AVec{StaticArrays.SVector{3,T}}) = unzip(xyz)
+@recipe f{T<:Number}(xyz::StaticArrays.SVector{3,T})       = [xyz[1]], [xyz[2]], [xyz[3]]

 #
 # # --------------------------------------------------------------------
@@ -533,64 +508,13 @@ 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))
-
-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 groupedvec2mat(x_ind, x, y::AbstractArray, groupby, def_val = y[1])
-    y_mat = Array{promote_type(eltype(y), typeof(def_val))}(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.(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
+    for (i,glab) in enumerate(groupby.groupLabels)
+        @series begin
+            label     --> string(glab)
+            idxfilter --> groupby.groupIds[i]
+            args
        end
-    else
-        g = args[1]
-        if length(g.args) == 1
-            x = zeros(Int64, 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(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
@@ -1,6 +1,6 @@


-function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
+function Subplot{T<:AbstractBackend}(::T; parent = RootLayout())
    Subplot{T}(
        parent,
        Series[],
@@ -13,11 +13,6 @@ function Subplot(::T; parent = RootLayout()) where T<:AbstractBackend
    )
 end

-"""
-    plotarea(subplot)
-
-Return the bounding box of a subplot
-"""
 plotarea(sp::Subplot) = sp.plotarea
 plotarea!(sp::Subplot, bbox::BoundingBox) = (sp.plotarea = bbox)

@@ -37,14 +32,14 @@ get_subplot(plt::Plot, k) = plt.spmap[k]
 get_subplot(series::Series) = series.d[:subplot]

 get_subplot_index(plt::Plot, idx::Integer) = Int(idx)
-get_subplot_index(plt::Plot, sp::Subplot) = findfirst(x -> x === sp, plt.subplots)
+get_subplot_index(plt::Plot, sp::Subplot) = findfirst(_ -> _ === sp, plt.subplots)

 series_list(sp::Subplot) = sp.series_list # filter(series -> series.d[:subplot] === sp, sp.plt.series_list)

 function should_add_to_legend(series::Series)
    series.d[:primary] && series.d[:label] != "" &&
        !(series.d[:seriestype] in (
-            :hexbin,:bins2d,:histogram2d,:hline,:vline,
+            :hexbin,:histogram2d,:hline,:vline,
            :contour,:contourf,:contour3d,:surface,:wireframe,
            :heatmap, :pie, :image
        ))
@@ -1,169 +1,40 @@
-"""
-    theme(s::Symbol)

-Specify the colour theme for plots.
-"""
 function theme(s::Symbol; kw...)
-    defaults = _get_defaults(s)
-    _theme(s, defaults; kw...)
-end
-
-function _get_defaults(s::Symbol)
-    thm = PlotThemes._themes[s]
-    if :defaults in fieldnames(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,
+    # reset?
+    if s == :none || s == :default
+        PlotUtils._default_gradient[] = :inferno
+        default(;
+            bg        = :white,
+            bglegend  = :match,
+            bginside  = :match,
+            bgoutside = :match,
+            fg        = :auto,
+            fglegend  = :match,
+            fggrid    = :match,
+            fgaxis    = :match,
+            fgtext    = :match,
+            fgborder  = :match,
+            fgguide   = :match,
+            palette   = :auto
        )
-        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, :gradient)
-        PlotUtils.clibrary(:misc)
-        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
-    else
-        PlotUtils.clibrary(:Plots)
-        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
+        return
    end

-    # maybe overwrite the theme's gradient
-    kw = KW(kw)
-    if haskey(kw, :gradient)
-        kwgrad = pop!(kw, :gradient)
-        for clib in clibraries()
-            if kwgrad in cgradients(clib)
-                PlotUtils.clibrary(clib)
-                PlotUtils.default_cgrad(default = :sequential, sequential = kwgrad)
-                break
-            end
-        end
+    # update the default gradient and other defaults
+    thm = PlotThemes._themes[s]
+    if thm.gradient != nothing
+        PlotUtils._default_gradient[] = PlotThemes.gradient_name(s)
    end
-
-    # Set the theme's defaults
-    default(; defaults..., kw...)
-    return
+    default(;
+        bg       = thm.bg_secondary,
+        bginside = thm.bg_primary,
+        fg       = thm.lines,
+        fgtext   = thm.text,
+        fgguide  = thm.text,
+        fglegend = thm.text,
+        palette  = thm.palette,
+        kw...
+    )
 end

@deprecate set_theme(s) theme(s)
-
-@userplot ShowTheme
-
-_color_functions = KW(
-    :protanopic => protanopic,
-    :deuteranopic => deuteranopic,
-    :tritanopic => tritanopic,
-)
-_get_showtheme_args(thm::Symbol) = thm, identity
-_get_showtheme_args(thm::Symbol, func::Symbol) = thm, get(_color_functions, func, identity)
-
-@recipe function showtheme(st::ShowTheme)
-    thm, cfunc = _get_showtheme_args(st.args...)
-    defaults = _get_defaults(thm)
-
-    # get the gradient
-    gradient_colors = pop!(defaults, :gradient, cgrad(:inferno).colors)
-    gradient = cgrad(cfunc.(RGB.(gradient_colors)))
-
-    # get the palette
-    palette = pop!(defaults, :palette, get_color_palette(:auto, plot_color(:white), 17))
-    palette = cfunc.(RGB.(palette))
-
-    # apply the theme
-    for k in keys(defaults)
-        def = defaults[k]
-        arg = get(_keyAliases, k, k)
-        plotattributes[arg] = if typeof(def) <: Colorant
-            cfunc(RGB(def))
-        elseif eltype(def) <: Colorant
-            cfunc.(RGB.(def))
-        elseif contains(string(arg), "color")
-            cfunc.(RGB.(plot_color.(def)))
-        else
-            def
-        end
-    end
-
-    srand(1)
-
-    label := ""
-    colorbar := false
-    layout := (2, 3)
-
-    for j in 1:4
-        @series begin
-            subplot := 1
-            palette := palette
-            seriestype := :path
-            linewidth := 2
-            cumsum(randn(50))
-        end
-
-        @series begin
-            subplot := 2
-            seriestype := :scatter
-            palette := palette
-            markersize := 5
-            markerstrokewidth := 0
-            marker := (:circle, :diamond, :star5, :square)[j]
-            randn(10), randn(10)
-        end
-    end
-
-    @series begin
-        subplot := 3
-        seriestype := :histogram
-        palette := palette
-        randn(1000) .+ (0:2:4)'
-    end
-
-    f(r) = sin(r) / r
-    _norm(x, y) = norm([x, y])
-    x = y = linspace(-3π, 3π, 30)
-    z = f.(_norm.(x, y'))
-    wi = 2:3:30
-
-    @series begin
-        subplot := 4
-        seriestype := :heatmap
-        seriescolor := gradient
-        x, y, z
-    end
-
-    @series begin
-        subplot := 5
-        seriestype := :surface
-        seriescolor := gradient
-        x, y, z
-    end
-
-    n = 100
-    ts = linspace(0, 10π, n)
-    x = ts .* cos.(ts)
-    y = (0.1ts) .* sin.(ts)
-    z = 1:n
-
-    @series begin
-        subplot := 6
-        seriescolor := gradient
-        linewidth := 3
-        line_z := z
-        x, y, z
-    end
-
-end
@@ -2,24 +2,28 @@
 # TODO: I declare lots of types here because of the lacking ability to do forward declarations in current Julia
 # I should move these to the relevant files when something like "extern" is implemented

-const AVec = AbstractVector
-const AMat = AbstractMatrix
-const KW = Dict{Symbol,Any}
+typealias AVec AbstractVector
+typealias AMat AbstractMatrix
+typealias KW Dict{Symbol,Any}

-struct PlotsDisplay <: Display end
+immutable PlotsDisplay <: Display end
+
+abstract AbstractBackend
+abstract AbstractPlot{T<:AbstractBackend}
+abstract AbstractLayout

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

-struct InputWrapper{T}
+immutable InputWrapper{T}
    obj::T
 end
-wrap(obj::T) where {T} = InputWrapper{T}(obj)
+wrap{T}(obj::T) = InputWrapper{T}(obj)
 Base.isempty(wrapper::InputWrapper) = false


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

-mutable struct Series
+type Series
    d::KW
 end

@@ -29,7 +33,7 @@ attr!(series::Series, v, k::Symbol) = (series.d[k] = v)
 # -----------------------------------------------------------

 # a single subplot
-mutable struct Subplot{T<:AbstractBackend} <: AbstractLayout
+type Subplot{T<:AbstractBackend} <: AbstractLayout
    parent::AbstractLayout
    series_list::Vector{Series}  # arguments for each series
    minpad::Tuple # leftpad, toppad, rightpad, bottompad
@@ -45,12 +49,12 @@ 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
+type Axis
    sps::Vector{Subplot}
    d::KW
 end

-mutable struct Extrema
+type Extrema
    emin::Float64
    emax::Float64
 end
@@ -58,12 +62,12 @@ Extrema() = Extrema(Inf, -Inf)

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

-const SubplotMap = Dict{Any, Subplot}
+typealias SubplotMap Dict{Any, Subplot}

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


-mutable struct Plot{T<:AbstractBackend} <: AbstractPlot{T}
+type Plot{T<:AbstractBackend} <: AbstractPlot{T}
    backend::T                   # the backend type
    n::Int                       # number of series
    attr::KW                     # arguments for the whole plot
@@ -3,7 +3,7 @@ calcMidpoints(edges::AbstractVector) = Float64[0.5 * (edges[i] + edges[i+1]) for

 "Make histogram-like bins of data"
 function binData(data, nbins)
-  lo, hi = ignorenan_extrema(data)
+  lo, hi = extrema(data)
  edges = collect(linspace(lo, hi, nbins+1))
  midpoints = calcMidpoints(edges)
  buckets = Int[max(2, min(searchsortedfirst(edges, x), length(edges)))-1 for x in data]
@@ -109,12 +109,12 @@ function regressionXY(x, y)
  β, α = convert(Matrix{Float64}, [x ones(length(x))]) \ convert(Vector{Float64}, y)

  # make a line segment
-  regx = [ignorenan_minimum(x), ignorenan_maximum(x)]
+  regx = [minimum(x), maximum(x)]
  regy = β * regx + α
  regx, regy
 end

-function replace_image_with_heatmap(z::Array{T}) where T<:Colorant
+function replace_image_with_heatmap{T<:Colorant}(z::Array{T})
    @show T, size(z)
    n, m = size(z)
    # idx = 0
@@ -137,15 +137,15 @@ function imageHack(d::KW)
 end
 # ---------------------------------------------------------------

-"Build line segments for plotting"
-mutable struct Segments{T}
+
+type Segments{T}
    pts::Vector{T}
 end

 # Segments() = Segments{Float64}(zeros(0))

 Segments() = Segments(Float64)
-Segments(::Type{T}) where {T} = Segments(T[])
+Segments{T}(::Type{T}) = Segments(T[])
 Segments(p::Int) = Segments(NTuple{2,Float64}[])


@@ -157,7 +157,7 @@ to_nan(::Type{NTuple{2,Float64}}) = (NaN, NaN)
 coords(segs::Segments{Float64}) = segs.pts
 coords(segs::Segments{NTuple{2,Float64}}) = Float64[p[1] for p in segs.pts], Float64[p[2] for p in segs.pts]

-function Base.push!(segments::Segments{T}, vs...) where T
+function Base.push!{T}(segments::Segments{T}, vs...)
    if !isempty(segments.pts)
        push!(segments.pts, to_nan(T))
    end
@@ -167,7 +167,7 @@ function Base.push!(segments::Segments{T}, vs...) where T
    segments
 end

-function Base.push!(segments::Segments{T}, vs::AVec) where T
+function Base.push!{T}(segments::Segments{T}, vs::AVec)
    if !isempty(segments.pts)
        push!(segments.pts, to_nan(T))
    end
@@ -181,11 +181,10 @@ end
 # -----------------------------------------------------
 # helper to manage NaN-separated segments

-mutable struct SegmentsIterator
+type SegmentsIterator
    args::Tuple
    n::Int
 end
-
 function iter_segments(args...)
    tup = Plots.wraptuple(args)
    n = maximum(map(length, tup))
@@ -193,7 +192,7 @@ function iter_segments(args...)
 end

 # helpers to figure out if there are NaN values in a list of array types
-anynan(i::Int, args::Tuple) = any(a -> !isfinite(_cycle(a,i)), args)
+anynan(i::Int, args::Tuple) = any(a -> !isfinite(cycle(a,i)), args)
 anynan(istart::Int, iend::Int, args::Tuple) = any(i -> anynan(i, args), istart:iend)
 allnan(istart::Int, iend::Int, args::Tuple) = all(i -> anynan(i, args), istart:iend)

@@ -232,8 +231,8 @@ end
 # Find minimal type that can contain NaN and x
 # To allow use of NaN separated segments with categorical x axis

-float_extended_type(x::AbstractArray{T}) where {T} = Union{T,Float64}
-float_extended_type(x::AbstractArray{T}) where {T<:Real} = Float64
+float_extended_type{T}(x::AbstractArray{T}) = Union{T,Float64}
+float_extended_type{T<:Real}(x::AbstractArray{T}) = Float64

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

@@ -244,56 +243,56 @@ notimpl() = error("This has not been implemented yet")
 isnothing(x::Void) = true
 isnothing(x) = false

-_cycle(wrapper::InputWrapper, idx::Int) = wrapper.obj
-_cycle(wrapper::InputWrapper, idx::AVec{Int}) = wrapper.obj
+cycle(wrapper::InputWrapper, idx::Int) = wrapper.obj
+cycle(wrapper::InputWrapper, idx::AVec{Int}) = wrapper.obj

-_cycle(v::AVec, idx::Int) = v[mod1(idx, length(v))]
-_cycle(v::AMat, idx::Int) = size(v,1) == 1 ? v[1, mod1(idx, size(v,2))] : v[:, mod1(idx, size(v,2))]
-_cycle(v, idx::Int)       = v
+cycle(v::AVec, idx::Int) = v[mod1(idx, length(v))]
+cycle(v::AMat, idx::Int) = size(v,1) == 1 ? v[1, mod1(idx, size(v,2))] : v[:, mod1(idx, size(v,2))]
+cycle(v, idx::Int)       = v

-_cycle(v::AVec, indices::AVec{Int}) = map(i -> _cycle(v,i), indices)
-_cycle(v::AMat, indices::AVec{Int}) = map(i -> _cycle(v,i), indices)
-_cycle(v, indices::AVec{Int})       = fill(v, length(indices))
+cycle(v::AVec, indices::AVec{Int}) = map(i -> cycle(v,i), indices)
+cycle(v::AMat, indices::AVec{Int}) = map(i -> cycle(v,i), indices)
+cycle(v, indices::AVec{Int})       = fill(v, length(indices))

-_cycle(grad::ColorGradient, idx::Int) = _cycle(grad.colors, idx)
-_cycle(grad::ColorGradient, indices::AVec{Int}) = _cycle(grad.colors, indices)
+cycle(grad::ColorGradient, idx::Int) = cycle(grad.colors, idx)
+cycle(grad::ColorGradient, indices::AVec{Int}) = cycle(grad.colors, indices)

 makevec(v::AVec) = v
-makevec(v::T) where {T} = T[v]
+makevec{T}(v::T) = T[v]

 "duplicate a single value, or pass the 2-tuple through"
 maketuple(x::Real)                     = (x,x)
-maketuple(x::Tuple{T,S}) where {T,S} = x
+maketuple{T,S}(x::Tuple{T,S}) = x

 mapFuncOrFuncs(f::Function, u::AVec)        = map(f, u)
-mapFuncOrFuncs(fs::AVec{F}, u::AVec) where {F<:Function} = [map(f, u) for f in fs]
+mapFuncOrFuncs{F<:Function}(fs::AVec{F}, u::AVec) = [map(f, u) for f in fs]

-unzip(xy::AVec{Tuple{X,Y}}) where {X,Y}              = [t[1] for t in xy], [t[2] for t in xy]
-unzip(xyz::AVec{Tuple{X,Y,Z}}) where {X,Y,Z}         = [t[1] for t in xyz], [t[2] for t in xyz], [t[3] for t in xyz]
-unzip(xyuv::AVec{Tuple{X,Y,U,V}}) where {X,Y,U,V}    = [t[1] for t in xyuv], [t[2] for t in xyuv], [t[3] for t in xyuv], [t[4] for t in xyuv]
+unzip{X,Y}(xy::AVec{Tuple{X,Y}})              = [t[1] for t in xy], [t[2] for t in xy]
+unzip{X,Y,Z}(xyz::AVec{Tuple{X,Y,Z}})         = [t[1] for t in xyz], [t[2] for t in xyz], [t[3] for t in xyz]
+unzip{X,Y,U,V}(xyuv::AVec{Tuple{X,Y,U,V}})    = [t[1] for t in xyuv], [t[2] for t in xyuv], [t[3] for t in xyuv], [t[4] for t in xyuv]

-unzip(xy::AVec{FixedSizeArrays.Vec{2,T}}) where {T}  = T[t[1] for t in xy], T[t[2] for t in xy]
-unzip(xy::FixedSizeArrays.Vec{2,T}) where {T}        = T[xy[1]], T[xy[2]]
+unzip{T}(xy::AVec{StaticArrays.SVector{2,T}})  = T[t[1] for t in xy], T[t[2] for t in xy]
+unzip{T}(xy::StaticArrays.SVector{2,T})        = T[xy[1]], T[xy[2]]

-unzip(xyz::AVec{FixedSizeArrays.Vec{3,T}}) where {T} = T[t[1] for t in xyz], T[t[2] for t in xyz], T[t[3] for t in xyz]
-unzip(xyz::FixedSizeArrays.Vec{3,T}) where {T}       = T[xyz[1]], T[xyz[2]], T[xyz[3]]
+unzip{T}(xyz::AVec{StaticArrays.SVector{3,T}}) = T[t[1] for t in xyz], T[t[2] for t in xyz], T[t[3] for t in xyz]
+unzip{T}(xyz::StaticArrays.SVector{3,T})       = T[xyz[1]], T[xyz[2]], T[xyz[3]]

-unzip(xyuv::AVec{FixedSizeArrays.Vec{4,T}}) where {T} = T[t[1] for t in xyuv], T[t[2] for t in xyuv], T[t[3] for t in xyuv], T[t[4] for t in xyuv]
-unzip(xyuv::FixedSizeArrays.Vec{4,T}) where {T}       = T[xyuv[1]], T[xyuv[2]], T[xyuv[3]], T[xyuv[4]]
+unzip{T}(xyuv::AVec{StaticArrays.SVector{4,T}}) = T[t[1] for t in xyuv], T[t[2] for t in xyuv], T[t[3] for t in xyuv], T[t[4] for t in xyuv]
+unzip{T}(xyuv::StaticArrays.SVector{4,T})       = T[xyuv[1]], T[xyuv[2]], T[xyuv[3]], T[xyuv[4]]

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

-expand_data(v, n::Integer) = [_cycle(v, i) for i=1:n]
+expand_data(v, n::Integer) = [cycle(v, i) for i=1:n]

 # if the type exists in a list, replace the first occurence.  otherwise add it to the end
 function addOrReplace(v::AbstractVector, t::DataType, args...; kw...)
@@ -325,7 +324,7 @@ function replaceAliases!(d::KW, aliases::Dict{Symbol,Symbol})
  end
 end

-createSegments(z) = collect(repmat(reshape(z,1,:),2,1))[2:end]
+createSegments(z) = collect(repmat(z',2,1))[2:end]

 Base.first(c::Colorant) = c
 Base.first(x::Symbol) = x
@@ -333,56 +332,32 @@ Base.first(x::Symbol) = x

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

-
-const _scale_base = Dict{Symbol, Real}(
-    :log10 => 10,
-    :log2 => 2,
-    :ln => e,
-)
-
 "create an (n+1) list of the outsides of heatmap rectangles"
-function heatmap_edges(v::AVec, scale::Symbol = :identity)
-  vmin, vmax = ignorenan_extrema(v)
-  extra_min = extra_max = 0.5 * (vmax-vmin) / (length(v)-1)
-  if scale in _logScales
-      vmin > 0 || error("The axis values must be positive for a $scale scale")
-      while vmin - extra_min <= 0
-          extra_min /= _scale_base[scale]
-      end
-  end
-  vcat(vmin-extra_min, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra_max)
+function heatmap_edges(v::AVec)
+  vmin, vmax = extrema(v)
+  extra = 0.5 * (vmax-vmin) / (length(v)-1)
+  vcat(vmin-extra, 0.5 * (v[1:end-1] + v[2:end]), vmax+extra)
 end


 function calc_r_extrema(x, y)
-    xmin, xmax = ignorenan_extrema(x)
-    ymin, ymax = ignorenan_extrema(y)
-    r = 0.5 * NaNMath.min(xmax - xmin, ymax - ymin)
-    ignorenan_extrema(r)
+    xmin, xmax = extrema(x)
+    ymin, ymax = extrema(y)
+    r = 0.5 * min(xmax - xmin, ymax - ymin)
+    extrema(r)
 end

 function convert_to_polar(x, y, r_extrema = calc_r_extrema(x, y))
    rmin, rmax = r_extrema
-    theta, r = filter_radial_data(x, y, r_extrema)
-    r = (r - rmin) / (rmax - rmin)
-    x = r.*cos.(theta)
-    y = r.*sin.(theta)
-    x, y
-end
-
-# Filters radial data for points within the axis limits
-function filter_radial_data(theta, r, r_extrema::Tuple{Real, Real})
-    n = max(length(theta), length(r))
-    rmin, rmax = r_extrema
-    x, y = zeros(n), zeros(n)
+    phi, r = x, y
+    r = 0.5 * (r - rmin) / (rmax - rmin)
+    n = max(length(phi), length(r))
+    x = zeros(n)
+    y = zeros(n)
    for i in 1:n
-        x[i] = _cycle(theta, i)
-        y[i] = _cycle(r, i)
+        x[i] = cycle(r,i) * cos(cycle(phi,i))
+        y[i] = cycle(r,i) * sin(cycle(phi,i))
    end
-    points = map((a, b) -> (a, b), x, y)
-    filter!(a -> a[2] >= rmin && a[2] <= rmax, points)
-    x = map(a -> a[1], points)
-    y = map(a -> a[2], points)
    x, y
 end

@@ -399,7 +374,7 @@ isatom() = isdefined(Main, :Atom) && Main.Atom.isconnected()

 function is_installed(pkgstr::AbstractString)
    try
-        Pkg.installed(pkgstr) === nothing ? false : true
+        Pkg.installed(pkgstr) === nothing ? false: true
    catch
        false
    end
@@ -421,20 +396,20 @@ isvertical(d::KW) = get(d, :orientation, :vertical) in (:vertical, :v, :vert)
 isvertical(series::Series) = isvertical(series.d)


-ticksType(ticks::AVec{T}) where {T<:Real}                      = :ticks
-ticksType(ticks::AVec{T}) where {T<:AbstractString}            = :labels
-ticksType(ticks::Tuple{T,S}) where {T<:AVec,S<:AVec}  = :ticks_and_labels
+ticksType{T<:Real}(ticks::AVec{T})                      = :ticks
+ticksType{T<:AbstractString}(ticks::AVec{T})            = :labels
+ticksType{T<:AVec,S<:AVec}(ticks::Tuple{T,S})  = :ticks_and_labels
 ticksType(ticks)                                        = :invalid

-limsType(lims::Tuple{T,S}) where {T<:Real,S<:Real}    = :limits
+limsType{T<:Real,S<:Real}(lims::Tuple{T,S})    = :limits
 limsType(lims::Symbol)                                  = lims == :auto ? :auto : :invalid
 limsType(lims)                                          = :invalid

 # axis_Symbol(letter, postfix) = Symbol(letter * postfix)
 # axis_symbols(letter, postfix...) = map(s -> axis_Symbol(letter, s), postfix)

-Base.convert(::Type{Vector{T}}, rng::Range{T}) where {T<:Real}         = T[x for x in rng]
-Base.convert(::Type{Vector{T}}, rng::Range{S}) where {T<:Real,S<:Real} = T[x for x in rng]
+Base.convert{T<:Real}(::Type{Vector{T}}, rng::Range{T})         = T[x for x in rng]
+Base.convert{T<:Real,S<:Real}(::Type{Vector{T}}, rng::Range{S}) = T[x for x in rng]

 Base.merge(a::AbstractVector, b::AbstractVector) = sort(unique(vcat(a,b)))

@@ -494,7 +469,7 @@ ok(tup::Tuple) = ok(tup...)
 # compute one side of a fill range from a ribbon
 function make_fillrange_side(y, rib)
    frs = zeros(length(y))
-    for (i, (yi, ri)) in enumerate(zip(y, Base.Iterators.cycle(rib)))
+    for (i, (yi, ri)) in enumerate(zip(y, Base.cycle(rib)))
        frs[i] = yi + ri
    end
    frs
@@ -505,44 +480,16 @@ function make_fillrange_from_ribbon(kw::KW)
    y, rib = kw[:y], kw[:ribbon]
    rib = wraptuple(rib)
    rib1, rib2 = -first(rib), last(rib)
-    # kw[:ribbon] = nothing
+    kw[:ribbon] = nothing
    kw[:fillrange] = make_fillrange_side(y, rib1), make_fillrange_side(y, rib2)
-    (get(kw, :fillalpha, nothing) == nothing) && (kw[:fillalpha] = 0.5)
-end
-
-#turn tuple of fillranges to one path
-function concatenate_fillrange(x,y::Tuple)
-    rib1, rib2 = first(y), last(y)
-    yline = vcat(rib1,(rib2)[end:-1:1])
-    xline = vcat(x,x[end:-1:1])
-    return xline, yline
 end

 function get_sp_lims(sp::Subplot, letter::Symbol)
    axis_limits(sp[Symbol(letter, :axis)])
 end
-
-"""
-    xlims([plt])
-
-Returns the x axis limits of the current plot or subplot
-"""
 xlims(sp::Subplot) = get_sp_lims(sp, :x)
-
-"""
-    ylims([plt])
-
-Returns the y axis limits of the current plot or subplot
-"""
 ylims(sp::Subplot) = get_sp_lims(sp, :y)
-
-"""
-    zlims([plt])
-
-Returns the z axis limits of the current plot or subplot
-"""
 zlims(sp::Subplot) = get_sp_lims(sp, :z)
-
 xlims(plt::Plot, sp_idx::Int = 1) = xlims(plt[sp_idx])
 ylims(plt::Plot, sp_idx::Int = 1) = ylims(plt[sp_idx])
 zlims(plt::Plot, sp_idx::Int = 1) = zlims(plt[sp_idx])
@@ -550,83 +497,6 @@ xlims(sp_idx::Int = 1) = xlims(current(), sp_idx)
 ylims(sp_idx::Int = 1) = ylims(current(), sp_idx)
 zlims(sp_idx::Int = 1) = zlims(current(), sp_idx)

-
-function get_clims(sp::Subplot)
-    zmin, zmax = Inf, -Inf
-    for series in series_list(sp)
-        for vals in (series[:z], series[:line_z], series[:marker_z], series[:fill_z])
-            if (typeof(vals) <: AbstractSurface) && (eltype(vals.surf) <: Real)
-                zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals.surf)...)
-            elseif (vals != nothing) && (eltype(vals) <: Real)
-                zmin, zmax = _update_clims(zmin, zmax, ignorenan_extrema(vals)...)
-            end
-        end
-    end
-    clims = sp[:clims]
-    if is_2tuple(clims)
-        isfinite(clims[1]) && (zmin = clims[1])
-        isfinite(clims[2]) && (zmax = clims[2])
-    end
-    return zmin < zmax ? (zmin, zmax) : (0.0, 0.0)
-end
-
-_update_clims(zmin, zmax, emin, emax) = min(zmin, emin), max(zmax, emax)
-
-function hascolorbar(series::Series)
-    st = series[:seriestype]
-    hascbar = st in (:heatmap, :contour)
-    if series[:marker_z] != nothing || series[:line_z] != nothing || series[:fill_z] != nothing
-        hascbar = true
-    end
-    # no colorbar if we are creating a surface LightSource
-    if xor(st == :surface, series[:fill_z] != nothing)
-        hascbar = true
-    end
-    return hascbar
-end
-
-function hascolorbar(sp::Subplot)
-    cbar = sp[:colorbar]
-    hascbar = false
-    if cbar != :none
-        for series in series_list(sp)
-            if hascolorbar(series)
-                hascbar = true
-            end
-        end
-    end
-    hascbar
-end
-
-function get_linecolor(sp::Subplot, series::Series, i::Int = 1)
-    lc = series[:linecolor]
-    lz = series[:line_z]
-    if lz == nothing
-        isa(lc, ColorGradient) ? lc : _cycle(lc, i)
-    else
-        cmin, cmax = get_clims(sp)
-        grad = isa(lc, ColorGradient) ? lc : cgrad()
-        grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)]
-    end
-end
-
-function get_fillcolor(sp::Subplot, series::Series, i::Int = 1)
-    fc = series[:fillcolor]
-    fz = series[:fill_z]
-    lz = series[:line_z]
-    if fz == nothing && lz == nothing
-        isa(fc, ColorGradient) ? fc : _cycle(fc, i)
-    else
-        cmin, cmax = get_clims(sp)
-        grad = isa(fc, ColorGradient) ? fc : cgrad()
-        if fz != nothing
-            grad[clamp((_cycle(fz, i) - cmin) / (cmax - cmin), 0, 1)]
-        elseif lz != nothing
-            grad[clamp((_cycle(lz, i) - cmin) / (cmax - cmin), 0, 1)]
-        end
-    end
-end
-
 # ---------------------------------------------------------------

 makekw(; kw...) = KW(kw)
@@ -653,7 +523,7 @@ allFunctions(arg)   = trueOrAllTrue(a -> isa(a, Function), arg)
 """
 Allows temporary setting of backend and defaults for Plots. Settings apply only for the `do` block.  Example:
 ```
-with(:gr, size=(400,400), type=:histogram) do
+with(:gadfly, size=(400,400), type=:histogram) do
  plot(rand(10))
  plot(rand(10))
 end
@@ -738,7 +608,7 @@ end
 # ---------------------------------------------------------------
 # ---------------------------------------------------------------

-mutable struct DebugMode
+type DebugMode
  on::Bool
 end
 const _debugMode = DebugMode(false)
@@ -775,11 +645,11 @@ end
 # used in updating an existing series

 extendSeriesByOne(v::UnitRange{Int}, n::Int = 1) = isempty(v) ? (1:n) : (minimum(v):maximum(v)+n)
-extendSeriesByOne(v::AVec, n::Integer = 1)       = isempty(v) ? (1:n) : vcat(v, (1:n) + ignorenan_maximum(v))
-extendSeriesData(v::Range{T}, z::Real) where {T}        = extendSeriesData(float(collect(v)), z)
-extendSeriesData(v::Range{T}, z::AVec) where {T}        = extendSeriesData(float(collect(v)), z)
-extendSeriesData(v::AVec{T}, z::Real) where {T}         = (push!(v, convert(T, z)); v)
-extendSeriesData(v::AVec{T}, z::AVec) where {T}         = (append!(v, convert(Vector{T}, z)); v)
+extendSeriesByOne(v::AVec, n::Integer = 1)       = isempty(v) ? (1:n) : vcat(v, (1:n) + maximum(v))
+extendSeriesData{T}(v::Range{T}, z::Real)        = extendSeriesData(float(collect(v)), z)
+extendSeriesData{T}(v::Range{T}, z::AVec)        = extendSeriesData(float(collect(v)), z)
+extendSeriesData{T}(v::AVec{T}, z::Real)         = (push!(v, convert(T, z)); v)
+extendSeriesData{T}(v::AVec{T}, z::AVec)         = (append!(v, convert(Vector{T}, z)); v)


 # -------------------------------------------------------
@@ -797,14 +667,14 @@ function getxyz(plt::Plot, i::Integer)
    tovec(d[:x]), tovec(d[:y]), tovec(d[:z])
 end

-function setxy!(plt::Plot, xy::Tuple{X,Y}, i::Integer) where {X,Y}
+function setxy!{X,Y}(plt::Plot, xy::Tuple{X,Y}, i::Integer)
    series = plt.series_list[i]
    series.d[:x], series.d[:y] = xy
    sp = series.d[:subplot]
    reset_extrema!(sp)
    _series_updated(plt, series)
 end
-function setxyz!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z}
+function setxyz!{X,Y,Z}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer)
    series = plt.series_list[i]
    series.d[:x], series.d[:y], series.d[:z] = xyz
    sp = series.d[:subplot]
@@ -812,7 +682,7 @@ function setxyz!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z}
    _series_updated(plt, series)
 end

-function setxyz!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z<:AbstractMatrix}
+function setxyz!{X,Y,Z<:AbstractMatrix}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer)
    setxyz!(plt, (xyz[1], xyz[2], Surface(xyz[3])), i)
 end

@@ -821,8 +691,8 @@ end
 # indexing notation

 # Base.getindex(plt::Plot, i::Integer) = getxy(plt, i)
-Base.setindex!(plt::Plot, xy::Tuple{X,Y}, i::Integer) where {X,Y} = (setxy!(plt, xy, i); plt)
-Base.setindex!(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) where {X,Y,Z} = (setxyz!(plt, xyz, i); plt)
+Base.setindex!{X,Y}(plt::Plot, xy::Tuple{X,Y}, i::Integer) = (setxy!(plt, xy, i); plt)
+Base.setindex!{X,Y,Z}(plt::Plot, xyz::Tuple{X,Y,Z}, i::Integer) = (setxyz!(plt, xyz, i); plt)

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

@@ -934,10 +804,10 @@ function Base.append!(plt::Plot, i::Integer, x::AVec, y::AVec, z::AVec)
 end

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

 # -------------------------------------------------------
 # push/append for all series
@@ -1001,49 +871,9 @@ mm2px(mm::Real)         = float(px / MM_PER_PX)


 "Smallest x in plot"
-xmin(plt::Plot) = ignorenan_minimum([ignorenan_minimum(series.d[:x]) for series in plt.series_list])
+xmin(plt::Plot) = minimum([minimum(series.d[:x]) for series in plt.series_list])
 "Largest x in plot"
-xmax(plt::Plot) = ignorenan_maximum([ignorenan_maximum(series.d[:x]) for series in plt.series_list])
+xmax(plt::Plot) = maximum([maximum(series.d[:x]) for series in plt.series_list])

 "Extrema of x-values in plot"
-ignorenan_extrema(plt::Plot) = (xmin(plt), xmax(plt))
-
-
-# ---------------------------------------------------------------
-# get fonts from objects:
-
-titlefont(sp::Subplot) = font(
-    sp[:titlefontfamily],
-    sp[:titlefontsize],
-    sp[:titlefontvalign],
-    sp[:titlefonthalign],
-    sp[:titlefontrotation],
-    sp[:titlefontcolor],
-)
-
-legendfont(sp::Subplot) = font(
-    sp[:legendfontfamily],
-    sp[:legendfontsize],
-    sp[:legendfontvalign],
-    sp[:legendfonthalign],
-    sp[:legendfontrotation],
-    sp[:legendfontcolor],
-)
-
-tickfont(ax::Axis) = font(
-    ax[:tickfontfamily],
-    ax[:tickfontsize],
-    ax[:tickfontvalign],
-    ax[:tickfonthalign],
-    ax[:tickfontrotation],
-    ax[:tickfontcolor],
-)
-
-guidefont(ax::Axis) = font(
-    ax[:guidefontfamily],
-    ax[:guidefontsize],
-    ax[:guidefontvalign],
-    ax[:guidefonthalign],
-    ax[:guidefontrotation],
-    ax[:guidefontcolor],
-)
+Base.extrema(plt::Plot) = (xmin(plt), xmax(plt))
@@ -1,4 +1,5 @@
 StatPlots
+FactCheck
 Images
 ImageMagick
@osx QuartzImageIO
@@ -6,3 +7,4 @@ GR
 RDatasets
 VisualRegressionTests
 UnicodePlots
+Glob
@@ -15,7 +15,8 @@ end

 using Plots
 using StatPlots
-using Base.Test
+using FactCheck
+using Glob

 default(size=(500,300))

@@ -23,7 +24,7 @@ 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)

-const _current_plots_version = v"0.13.1"
+const _current_plots_version = v"0.9.6"


 function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], eps = 1e-2)
@@ -42,8 +43,11 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
    fn = "ref$idx.png"

    # firgure out version info
-    vns = filter(x->x[1] != '.', readdir(refdir))
-    versions = sort(VersionNumber.(vns), rev = true)
+    G = glob(joinpath(relpath(refdir), "*"))
+    # @show refdir fn G
+    slash = (@static is_windows() ? "\\" : "/")
+    versions = map(fn -> VersionNumber(split(fn, slash)[end]), G)
+    versions = reverse(sort(versions))
    versions = filter(v -> v <= _current_plots_version, versions)
    # @show refdir fn versions

@@ -95,7 +99,7 @@ function image_comparison_facts(pkg::Symbol;
  for i in 1:length(Plots._examples)
    i in skip && continue
    if only == nothing || i in only
-      @test image_comparison_tests(pkg, i, debug=debug, sigma=sigma, eps=eps) |> success == true
+      @fact image_comparison_tests(pkg, i, debug=debug, sigma=sigma, eps=eps) |> success --> true
    end
  end
 end
@@ -5,11 +5,9 @@ set -ex
 sudo apt-get -qq update
 # sudo apt-get install -y wkhtmltopdf

-sudo apt-get install -y xfonts-75dpi xfonts-base
-wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.2.1/wkhtmltox-0.12.2.1_linux-precise-amd64.deb
-sudo dpkg -i wkhtmltox-0.12.2.1_linux-precise-amd64.deb
-# wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2/wkhtmltox-0.12.2_linux-trusty-amd64.deb
-# sudo dpkg -i wkhtmltox-0.12.2_linux-trusty-amd64.deb
+sudo apt-get install -y xfonts-75dpi
+wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2/wkhtmltox-0.12.2_linux-trusty-amd64.deb
+sudo dpkg -i wkhtmltox-0.12.2_linux-trusty-amd64.deb
 wkhtmltoimage http://www.google.com test.png
 ls

@@ -7,135 +7,89 @@ srand(1234)
 default(show=false, reuse=true)
 img_eps = isinteractive() ? 1e-2 : 10e-2

-@testset "GR" begin
-    ENV["GKSwstype"] = "100"
-    @test gr() == Plots.GRBackend()
-    @test backend() == Plots.GRBackend()
+# facts("Gadfly") do
+#     @fact gadfly() --> Plots.GadflyBackend()
+#     @fact backend() --> Plots.GadflyBackend()
+#
+#     @fact typeof(plot(1:10)) --> Plots.Plot{Plots.GadflyBackend}
+#     @fact plot(Int[1,2,3], rand(3)) --> not(nothing)
+#     @fact plot(sort(rand(10)), rand(Int, 10, 3)) --> not(nothing)
+#     @fact plot!(rand(10,3), rand(10,3)) --> not(nothing)
+#
+#     image_comparison_facts(:gadfly, skip=[4,6,23,24,27], eps=img_eps)
+# end

-    image_comparison_facts(:gr, eps=img_eps)
+facts("PyPlot") do
+    @fact pyplot() --> Plots.PyPlotBackend()
+    @fact backend() --> Plots.PyPlotBackend()
+
+    image_comparison_facts(:pyplot, skip=[25,30], eps=img_eps)
+end
+
+facts("GR") do
+    @fact gr() --> Plots.GRBackend()
+    @fact backend() --> Plots.GRBackend()
+
+    if is_linux() && isinteractive()
+        image_comparison_facts(:gr, skip=[2,25,30], eps=img_eps)
+    end
+end
+
+facts("Plotly") do
+    @fact plotly() --> Plots.PlotlyBackend()
+    @fact backend() --> Plots.PlotlyBackend()
+
+    # # until png generation is reliable on OSX, just test on linux
+    # @static is_linux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
 end


-#@testset "PyPlot" begin
-#    @test pyplot() == Plots.PyPlotBackend()
-#    @test backend() == Plots.PyPlotBackend()
-#
-#    image_comparison_facts(:pyplot, eps=img_eps)
-#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)
-
-# @testset "PlotlyJS" begin
-#     @test plotlyjs() == Plots.PlotlyJSBackend()
-#     @test backend() == Plots.PlotlyJSBackend()
-#
-#     if is_linux() && isinteractive()
-#         image_comparison_facts(:plotlyjs,
-#             skip=[
-#                 2,  # animation (skipped for speed)
-#                 27, # (polar plots) takes very long / not working
-#                 31, # animation (skipped for speed)
-#             ],
-#             eps=img_eps)
-#     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
-#         ],
-#         eps=img_eps)
-# end
-
-
-# @testset "Plotly" begin
-#     @test plotly() == Plots.PlotlyBackend()
-#     @test backend() == Plots.PlotlyBackend()
-#
-#     # # until png generation is reliable on OSX, just test on linux
-#     # @static is_linux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], eps=img_eps)
-# end
-
-
-# @testset "Immerse" begin
-#     @test immerse() == Plots.ImmerseBackend()
-#     @test backend() == Plots.ImmerseBackend()
+# facts("Immerse") do
+#     @fact immerse() --> Plots.ImmerseBackend()
+#     @fact backend() --> Plots.ImmerseBackend()
 #
 #     # as long as we can plot anything without error, it should be the same as Gadfly
 #     image_comparison_facts(:immerse, only=[1], eps=img_eps)
 # end


-# @testset "PlotlyJS" begin
-#     @test plotlyjs() == Plots.PlotlyJSBackend()
-#     @test backend() == Plots.PlotlyJSBackend()
+# facts("PlotlyJS") do
+#     @fact plotlyjs() --> Plots.PlotlyJSBackend()
+#     @fact 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], eps=img_eps)
 # end


-# @testset "Gadfly" begin
-#     @test gadfly() == Plots.GadflyBackend()
-#     @test backend() == Plots.GadflyBackend()
-#
-#     @test typeof(plot(1:10)) == Plots.Plot{Plots.GadflyBackend}
-#     @test plot(Int[1,2,3], rand(3)) == not(nothing)
-#     @test plot(sort(rand(10)), rand(Int, 10, 3)) == not(nothing)
-#     @test plot!(rand(10,3), rand(10,3)) == not(nothing)
-#
-#     image_comparison_facts(:gadfly, skip=[4,6,23,24,27], eps=img_eps)
-# end
+facts("UnicodePlots") do
+    @fact unicodeplots() --> Plots.UnicodePlotsBackend()
+    @fact backend() --> Plots.UnicodePlotsBackend()
+
+    # lets just make sure it runs without error
+    @fact isa(plot(rand(10)), Plots.Plot) --> true
+end



-
-@testset "Axes" begin
+facts("Axes") do
    p = plot()
    axis = p.subplots[1][:xaxis]
-    @test typeof(axis) == Plots.Axis
-    @test Plots.discrete_value!(axis, "HI") == (0.5, 1)
-    @test Plots.discrete_value!(axis, :yo) == (1.5, 2)
-    @test Plots.ignorenan_extrema(axis) == (0.5,1.5)
-    @test axis[:discrete_map] == Dict{Any,Any}(:yo  => 2, "HI" => 1)
+    @fact typeof(axis) --> Plots.Axis
+    @fact Plots.discrete_value!(axis, "HI") --> (0.5, 1)
+    @fact Plots.discrete_value!(axis, :yo) --> (1.5, 2)
+    @fact extrema(axis) --> (0.5,1.5)
+    @fact axis[:discrete_map] --> Dict{Any,Any}(:yo  => 2, "HI" => 1)

    Plots.discrete_value!(axis, ["x$i" for i=1:5])
    Plots.discrete_value!(axis, ["x$i" for i=0:2])
-    @test Plots.ignorenan_extrema(axis) == (0.5, 7.5)
+    @fact extrema(axis) --> (0.5, 7.5)
 end

-@testset "NoFail" begin
-    histogram([1, 0, 0, 0, 0, 0])
-end

 # tests for preprocessing recipes

-# @testset "recipes" begin
+# facts("recipes") do

    # user recipe

@@ -172,4 +126,6 @@ end
 # end


+
+FactCheck.exitstatus()
 end # module
@@ -1,8 +1,8 @@
-Pkg.add("ImageMagick")
-Pkg.build("ImageMagick")
+# Pkg.clone("ImageMagick")
+# Pkg.build("ImageMagick")

-Pkg.clone("GR")
-Pkg.build("GR")
+# Pkg.clone("GR")
+# Pkg.build("GR")

 Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")

@@ -11,12 +11,11 @@ Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git")
 Pkg.clone("StatPlots")
 Pkg.checkout("PlotUtils")

-# Pkg.clone("Blink")
+# Pkg.clone("https://github.com/JunoLab/Blink.jl.git")
 # Pkg.build("Blink")
 # import Blink
 # Blink.AtomShell.install()
-# Pkg.add("Rsvg")
-# Pkg.add("PlotlyJS")
+# Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")

 # Pkg.checkout("RecipesBase")
 # Pkg.clone("VisualRegressionTests")
@@ -26,6 +25,4 @@ ENV["PYTHON"] = ""
 Pkg.add("PyPlot")
 Pkg.build("PyPlot")

-# Pkg.add("InspectDR")
-
 Pkg.test("Plots"; coverage=false)
Author	SHA1	Message	Date
Tom Breloff	25bf71aff2	0.6 fixes	2017-02-21 12:10:38 -05:00
Tom Breloff	33d6c3426a	inline docs for plot	2017-01-18 13:45:02 -05:00
Tom Breloff	9d038ea05e	starting no-conditional reorg; replaced FixedSizeArrays with StaticArrays	2017-01-18 12:08:20 -05:00