started fonts

2017-01-09 11:42:53 -05:00
41 changed files with 743 additions and 2652 deletions
@@ -4,7 +4,7 @@ os:
  - linux
  # - osx
 julia:
-  - 0.6
+  - 0.5
 matrix:
  allow_failures:
    - julia: nightly
@@ -3,84 +3,14 @@

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

- All new development should target 0.12!
- 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.4

 ---
-## (current master)
-
-## 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 0.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

@@ -401,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,6 +1,6 @@
 # Plots

-[![Build Status](https://travis-ci.org/JuliaPlots/Plots.jl.svg?branch=master)](https://travis-ci.org/JuliaPlots/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) -->
@@ -1,15 +1,9 @@
-julia 0.6-pre
+julia 0.5

-RecipesBase 0.2.0
-PlotUtils 0.4.1
-PlotThemes 0.1.3
+RecipesBase
+PlotUtils
+PlotThemes
 Reexport
-StaticArrays 0.5
-FixedPointNumbers 0.3
+FixedSizeArrays
 Measures
 Showoff
-StatsBase 0.14.0
-JSON
-NaNMath
-Requires
-Contour
@@ -1,9 +1,9 @@
 environment:
  matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-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"
+  - 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
@@ -12,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

@@ -3,17 +3,12 @@ __precompile__(false)
 module Plots

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

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

+    @userplot,
+    @shorthands,
+
    pie,
    pie!,
    plot3d,
@@ -101,39 +99,13 @@ export
    center,
    P2,
    P3,
-    BezierCurve,
-
-    plotattr
-
-# ---------------------------------------------------------
-
-import NaNMath # define functions that ignores NaNs. To overcome the destructive effects of https://github.com/JuliaLang/julia/pull/12563
-ignorenan_minimum{F<:AbstractFloat}(x::AbstractArray{F}) = NaNMath.minimum(x)
-ignorenan_minimum(x) = Base.minimum(x)
-ignorenan_maximum{F<:AbstractFloat}(x::AbstractArray{F}) = NaNMath.maximum(x)
-ignorenan_maximum(x) = Base.maximum(x)
-ignorenan_mean{F<:AbstractFloat}(x::AbstractArray{F}) = NaNMath.mean(x)
-ignorenan_mean(x) = Base.mean(x)
-ignorenan_extrema{F<:AbstractFloat}(x::AbstractArray{F}) = 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
+    BezierCurve

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

 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

 # ---------------------------------------------------------
@@ -143,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")
@@ -151,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
@@ -243,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)
@@ -80,8 +80,7 @@ function buildanimation(animdir::AbstractString, fn::AbstractString;

    catch err
        warn("""Tried to create gif using convert (ImageMagick), but got error: $err
-            ImageMagick can be installed by executing `Pkg.add("ImageMagick")`.
-            You may also need to install the imagemagick c++ library through your operating system. 
+            ImageMagick can be installed by executing `Pkg.add("ImageMagick")`
            Will try ffmpeg, but it's lower quality...)""")

        # low quality
@@ -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. 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",
@@ -29,7 +29,6 @@ const _arg_desc = KW(
 :z                 	=> "Various. Input data. Third Dimension. May be wrapped by a `Surface` for surface and heatmap types.",
 :marker_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or nothing. z-values for each series data point, which correspond to the color to be used from a markercolor gradient.",
 :line_z          	=> "AbstractVector, Function `f(x,y,z) -> z_value`, or nothing. z-values for each series line segment, which correspond to the color to be used from a linecolor gradient.  Note that for N points, only the first N-1 values are used (one per line-segment).",
-:fill_z           => "Matrix{Float64} of the same size as z matrix, which specifies the color of the 3D surface; the default value is `nothing`.",
 :levels            	=> "Integer, NTuple{2,Integer}. Number of levels (or x-levels/y-levels) for a contour type.",
 :orientation       	=> "Symbol.  Horizontal or vertical orientation for bar types.  Values `:h`, `:hor`, `:horizontal` correspond to horizontal (sideways, anchored to y-axis), and `:v`, `:vert`, and `:vertical` correspond to vertical (the default).",
 :bar_position      	=> "Symbol.  Choose from `:overlay` (default), `:stack`.  (warning: May not be implemented fully)",
@@ -40,7 +39,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 PDF with integral of 1) and :density (only normalize in respect to 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`.",
@@ -80,7 +79,6 @@ const _arg_desc = KW(
 :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)",
-:legendtitle              => "String or nothing (default). Sets the legend title.",
 :colorbar                 => "Bool (show the colorbar?) or Symbol (colorbar position).  Symbol values: `:none`, `:best`, `:right`, `:left`, `:top`, `:bottom`, `:legend` (matches legend value) (note: only some may be supported in each backend)",
 :clims 					  => "`:auto` or NTuple{2,Number}.  Fixes the limits of the colorbar.",
 :legendfont               => "Font. Font of legend items.",
@@ -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,7 +77,7 @@ const _typeAliases = Dict{Symbol,Symbol}(

 add_non_underscore_aliases!(_typeAliases)

-like_histogram(seriestype::Symbol) = seriestype in (:histogram, :barhist, :barbins)
+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)

@@ -156,8 +153,6 @@ 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,
@@ -185,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,
@@ -193,7 +188,6 @@ const _series_defaults = KW(
    :z                 => nothing,   # depth for contour, surface, etc
    :marker_z          => nothing,   # value for color scale
    :line_z            => nothing,
-    :fill_z            => nothing,
    :levels            => 15,
    :orientation       => :vertical,
    :bar_position      => :overlay,  # for bar plots and histograms: could also be stack (stack up) or dodge (side by side)
@@ -251,7 +245,6 @@ const _subplot_defaults = KW(
    :foreground_color_title   => :match,            # title color
    :color_palette            => :auto,
    :legend                   => :best,
-    :legendtitle              => nothing,
    :colorbar                 => :legend,
    :clims                    => :auto,
    :legendfont               => font(8),
@@ -266,6 +259,15 @@ const _subplot_defaults = KW(
    :bottom_margin            => :match,
    :subplot_index            => -1,
    :colorbar_title           => "",
+    :fontfamily => "Helvetica",
+    :fontsize => 10,
+    :fontcolor => :match, # matches foreground_color
+    :titlefontfamily => :match,
+    :titlefontsize => :match,
+    :titlefontcolor => :match,
+    :legendfontfamily => :match,
+    :legendfontsize => :match,
+    :legendfontcolor => :match,
 )

 const _axis_defaults = KW(
@@ -285,6 +287,12 @@ const _axis_defaults = KW(
    :discrete_values => [],
    :formatter => :auto,
    :mirror => false,
+    :tickfontfamily => :match,
+    :tickfontsize => :match,
+    :tickfontcolor => :match,
+    :guidefontfamily => :match,
+    :guidefontsize => :match,
+    :guidefontcolor => :match,
 )

 const _suppress_warnings = Set{Symbol}([
@@ -336,12 +344,6 @@ const _all_defaults = KW[
    _axis_defaults_byletter
 ]

-# to be able to reset font sizes to initial values
-const _initial_fontsizes = Dict(:titlefont  => _subplot_defaults[:titlefont].pointsize,
-                                :legendfont => _subplot_defaults[:legendfont].pointsize,
-                                :tickfont   => _axis_defaults[:tickfont].pointsize,
-                                :guidefont  => _axis_defaults[:guidefont].pointsize)
-
 const _all_args = sort(collect(union(map(keys, _all_defaults)...)))

 RecipesBase.is_key_supported(k::Symbol) = is_attr_supported(k)
@@ -444,9 +446,7 @@ add_aliases(:zguide, :zlabel, :zlab, :zl)
 add_aliases(:zlims, :zlim, :zlimit, :zlimits)
 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)
@@ -458,7 +458,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)
@@ -528,6 +528,7 @@ function default(d::KW, k::Symbol)
 end


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

 # if arg is a valid color value, then set d[csym] and return true
@@ -706,9 +707,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
@@ -959,8 +957,13 @@ const _match_map2 = KW(
    :foreground_color_border  => :foreground_color_subplot,
    :foreground_color_guide   => :foreground_color_subplot,
    :foreground_color_text    => :foreground_color_subplot,
+    :fontcolor => :foreground_color_subplot,
 )

+for prefix in (:title,:legend,:guide,:tick), postfix in (:family,:size,:color)
+    _match_map2[Symbol(prefix,:font,postfix)] = Symbol(:font,postfix)
+end
+
 # properly retrieve from plt.attr, passing `:match` to the correct key
 function Base.getindex(plt::Plot, k::Symbol)
    v = plt.attr[k]
@@ -1275,7 +1278,7 @@ function _add_defaults!(d::KW, plt::Plot, sp::Subplot, commandIndex::Int)
    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
@@ -118,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}(
@@ -156,30 +156,6 @@ 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
    scaled_ticks = if ticks == nothing
        optimize_ticks(
@@ -229,7 +205,7 @@ function get_ticks(axis::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
@@ -238,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
@@ -260,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

@@ -276,8 +252,8 @@ expand_extrema!(axis::Axis, ::Bool) = axis[:extrema]

 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!{N<:Number}(axis::Axis, v::AVec{N})
@@ -349,11 +325,11 @@ function expand_extrema!(sp::Subplot, d::KW)

        bw = d[:bar_width]
        if bw == nothing
-            bw = d[:bar_width] = ignorenan_mean(diff(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

 end
@@ -368,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

@@ -425,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)
@@ -48,8 +48,8 @@ _series_updated(plt::Plot, series::Series) = nothing

 _before_layout_calcs(plt::Plot) = nothing

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

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

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

@@ -148,7 +148,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 ("PyPlot", "GR", "PlotlyJS", "Immerse", "Gadfly", "UnicodePlots")
        if Pkg.installed(pkgstr) != nothing
            return backend(Symbol(lowercase(pkgstr)))
        end
@@ -276,8 +276,6 @@ end
@init_backend GR
@init_backend GLVisualize
@init_backend PGFPlots
-@init_backend InspectDR
-@init_backend HDF5

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

@@ -1,4 +1,4 @@
-#=
+``#=
 TODO
    * move all gl_ methods to GLPlot
    * integrate GLPlot UI
@@ -7,6 +7,7 @@ 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!??!?
 =#

 const _glvisualize_attr = merge_with_base_supported([
@@ -58,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
@@ -66,8 +67,9 @@ function _initialize_backend(::GLVisualizeBackend; kw...)
        import GLVisualize: visualize
        import Plots.GL
        import UnicodeFun
-        Plots.slice_arg{C<:Colorant}(img::Matrix{C}, idx::Int) = img
+        Plots.slice_arg(img::Images.AbstractImage, idx::Int) = img
        is_marker_supported(::GLVisualizeBackend, shape::GLVisualize.AllPrimitives) = 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
@@ -76,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

@@ -92,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
@@ -108,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]...)
@@ -172,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
@@ -211,13 +260,13 @@ function extract_limits(sp, d, kw_args)
    nothing
 end

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

-to_vec{T <: StaticArrays.StaticVector{2}}(::Type{T}, vec::StaticArrays.StaticVector{3}) = T(vec[1], vec[2])
-to_vec{T <: StaticArrays.StaticVector{3}}(::Type{T}, vec::StaticArrays.StaticVector{2}) = 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{T <: StaticArrays.StaticVector}(::Type{T}, vecs::AbstractVector) = 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
@@ -273,7 +322,7 @@ function extract_surface(d)
    map(_extract_surface, (d[:x], d[:y], d[:z]))
 end
 function topoints{P}(::Type{P}, array)
-    [P(x) for x in zip(array...)]
+    P[x for x in zip(array...)]
 end
 function extract_points(d)
    dim = is3d(d) ? 3 : 2
@@ -303,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
@@ -314,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
@@ -366,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
@@ -481,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
@@ -508,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
@@ -575,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)
@@ -587,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
@@ -634,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)
@@ -645,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()
@@ -656,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
@@ -722,7 +774,7 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
        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 = xaxis[:guidefont]; color = gl_color(xaxis[:foreground_color_guide])
@@ -731,7 +783,7 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
        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] != ""
@@ -741,7 +793,7 @@ function gl_draw_axes_2d(sp::Plots.Subplot{Plots.GLVisualizeBackend}, model, are
        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
@@ -777,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
@@ -788,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
@@ -829,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
@@ -842,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
@@ -860,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
@@ -939,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)

@@ -1054,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
@@ -1089,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)
@@ -1118,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

@@ -1129,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
@@ -1144,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

@@ -1224,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
@@ -1302,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
@@ -1311,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
@@ -1332,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
@@ -1366,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))
@@ -1382,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

@@ -1429,7 +1480,7 @@ function make_label(sp, series, i)
    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

@@ -20,7 +20,7 @@ const _gr_attr = merge_with_base_supported([
    :title, :window_title,
    :guide, :lims, :ticks, :scale, :flip,
    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, :legendtitle, :colorbar,
+    :grid, :legend, :colorbar,
    :marker_z, :levels,
    :ribbon, :quiver,
    :orientation,
@@ -76,8 +76,6 @@ const gr_markertype = KW(
    :diamond => -13,
    :utriangle => -3,
    :dtriangle => -5,
-    :ltriangle => -18,
-    :rtriangle => -17,
    :pentagon => -21,
    :hexagon => -22,
    :heptagon => -23,
@@ -124,10 +122,10 @@ function gr_getcolorind(c)
    convert(Int, GR.inqcolorfromrgb(red(c), green(c), blue(c)))
 end

-gr_set_linecolor(c)   = GR.setlinecolorind(gr_getcolorind(_cycle(c,1)))
-gr_set_fillcolor(c)   = GR.setfillcolorind(gr_getcolorind(_cycle(c,1)))
-gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(_cycle(c,1)))
-gr_set_textcolor(c)   = GR.settextcolorind(gr_getcolorind(_cycle(c,1)))
+gr_set_linecolor(c)   = GR.setlinecolorind(gr_getcolorind(cycle(c,1)))
+gr_set_fillcolor(c)   = GR.setfillcolorind(gr_getcolorind(cycle(c,1)))
+gr_set_markercolor(c) = GR.setmarkercolorind(gr_getcolorind(cycle(c,1)))
+gr_set_textcolor(c)   = GR.settextcolorind(gr_getcolorind(cycle(c,1)))

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

@@ -174,8 +172,6 @@ function gr_polyline(x, y, func = GR.polyline; arrowside=:none)
    end
 end

-gr_inqtext(x, y, s::Symbol) = gr_inqtext(x, y, string(s))
-
 function gr_inqtext(x, y, s)
    if length(s) >= 2 && s[1] == '$' && s[end] == '$'
        GR.inqtextext(x, y, s[2:end-1])
@@ -186,8 +182,6 @@ function gr_inqtext(x, y, s)
    end
 end

-gr_text(x, y, s::Symbol) = gr_text(x, y, string(s))
-
 function gr_text(x, y, s)
    if length(s) >= 2 && s[1] == '$' && s[end] == '$'
        GR.mathtex(x, y, s[2:end-1])
@@ -264,7 +258,7 @@ end

 normalize_zvals(zv::Void) = zv
 function normalize_zvals(zv::AVec)
-    vmin, vmax = ignorenan_extrema(zv)
+    vmin, vmax = extrema(zv)
    if vmin == vmax
        zeros(length(zv))
    else
@@ -272,10 +266,6 @@ function normalize_zvals(zv::AVec)
    end
 end

-
-gr_alpha(α::Void) = 1
-gr_alpha(α::Real) = α
-
 # ---------------------------------------------------------

 # draw ONE Shape
@@ -283,19 +273,17 @@ function gr_draw_marker(xi, yi, msize, shape::Shape)
    sx, sy = coords(shape)
    # convert to ndc coords (percentages of window)
    GR.selntran(0)
-    w, h = gr_plot_size
-    f = msize / (w + h)
    xi, yi = GR.wctondc(xi, yi)
-    GR.fillarea(xi .+ sx .* f,
-                yi .+ sy .* f)
+    ms_ndc_x, ms_ndc_y = gr_pixels_to_ndc(msize, msize)
+    GR.fillarea(xi .+ sx .* ms_ndc_x,
+                yi .+ sy .* ms_ndc_y)
    GR.selntran(1)
 end

 # draw ONE symbol marker
 function gr_draw_marker(xi, yi, msize::Number, shape::Symbol)
    GR.setmarkertype(gr_markertype[shape])
-    w, h = gr_plot_size
-    GR.setmarkersize(0.3msize / ((w + h) * 0.001))
+    GR.setmarkersize(0.3msize)
    GR.polymarker([xi], [yi])
 end

@@ -305,23 +293,23 @@ function gr_draw_markers(series::Series, x, y, msize, mz)
    shapes = series[:markershape]
    if shapes != :none
        for i=1:length(x)
-            msi = _cycle(msize, i)
-            shape = _cycle(shapes, i)
+            msi = cycle(msize, i)
+            shape = cycle(shapes, i)
            cfunc = isa(shape, Shape) ? gr_set_fillcolor : gr_set_markercolor
            cfuncind = isa(shape, Shape) ? GR.setfillcolorind : GR.setmarkercolorind

            # draw a filled in shape, slightly bigger, to estimate a stroke
            if series[:markerstrokewidth] > 0
-                cfunc(_cycle(series[:markerstrokecolor], i)) #, series[:markerstrokealpha])
+                cfunc(cycle(series[:markerstrokecolor], i)) #, series[:markerstrokealpha])
                gr_draw_marker(x[i], y[i], msi + series[:markerstrokewidth], shape)
            end

            # draw the shape
            if mz == nothing
-                cfunc(_cycle(series[:markercolor], i)) #, series[:markeralpha])
+                cfunc(cycle(series[:markercolor], i)) #, series[:markeralpha])
            else
                # pick a color from the pre-loaded gradient
-                ci = round(Int, 1000 + _cycle(mz, i) * 255)
+                ci = round(Int, 1000 + cycle(mz, i) * 255)
                cfuncind(ci)
                GR.settransparency(_gr_gradient_alpha[ci-999])
            end
@@ -342,10 +330,9 @@ end

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

-function gr_set_line(lw, style, c) #, a)
+function gr_set_line(w, style, c) #, a)
    GR.setlinetype(gr_linetype[style])
-    w, h = gr_plot_size
-    GR.setlinewidth(max(0, lw / ((w + h) * 0.001)))
+    GR.setlinewidth(w)
    gr_set_linecolor(c) #, a)
 end

@@ -357,7 +344,7 @@ function gr_set_fill(c) #, a)
 end

 # this stores the conversion from a font pointsize to "percentage of window height" (which is what GR uses)
-const _gr_point_mult = 0.0018 * ones(1)
+const _gr_point_mult = zeros(1)

 # set the font attributes... assumes _gr_point_mult has been populated already
 function gr_set_font(f::Font; halign = f.halign, valign = f.valign,
@@ -388,30 +375,22 @@ end
 const viewport_plotarea = zeros(4)

 # the size of the current plot in pixels
-const gr_plot_size = [600.0, 400.0]
+const gr_plot_size = zeros(2)

-function gr_viewport_from_bbox(sp::Subplot{GRBackend}, bb::BoundingBox, w, h, viewport_canvas)
+function gr_viewport_from_bbox(bb::BoundingBox, w, h, viewport_canvas)
    viewport = zeros(4)
    viewport[1] = viewport_canvas[2] * (left(bb) / w)
    viewport[2] = viewport_canvas[2] * (right(bb) / w)
    viewport[3] = viewport_canvas[4] * (1.0 - bottom(bb) / h)
    viewport[4] = viewport_canvas[4] * (1.0 - top(bb) / h)
-    if is3d(sp)
-        vp = viewport[:]
-        extent = min(vp[2] - vp[1], vp[4] - vp[3])
-        viewport[1] = 0.5 * (vp[1] + vp[2] - extent)
-        viewport[2] = 0.5 * (vp[1] + vp[2] + extent)
-        viewport[3] = 0.5 * (vp[3] + vp[4] - extent)
-        viewport[4] = 0.5 * (vp[3] + vp[4] + extent)
-    end
    viewport
 end

 # change so we're focused on the viewport area
 function gr_set_viewport_cmap(sp::Subplot)
    GR.setviewport(
-        viewport_plotarea[2] + (is3d(sp) ? 0.07 : 0.02),
-        viewport_plotarea[2] + (is3d(sp) ? 0.10 : 0.05),
+        viewport_plotarea[2] + (is3d(sp) ? 0.04 : 0.02),
+        viewport_plotarea[2] + (is3d(sp) ? 0.07 : 0.05),
        viewport_plotarea[3],
        viewport_plotarea[4]
    )
@@ -432,7 +411,7 @@ function gr_set_viewport_polar()
    ymax -= 0.05 * (xmax - xmin)
    xcenter = 0.5 * (xmin + xmax)
    ycenter = 0.5 * (ymin + ymax)
-    r = 0.5 * NaNMath.min(xmax - xmin, ymax - ymin)
+    r = 0.5 * min(xmax - xmin, ymax - ymin)
    GR.setviewport(xcenter -r, xcenter + r, ycenter - r, ycenter + r)
    GR.setwindow(-1, 1, -1, 1)
    r
@@ -442,41 +421,23 @@ end
 function gr_colorbar(sp::Subplot)
    if sp[:colorbar] != :none
        gr_set_viewport_cmap(sp)
-        GR.colorbar()
+        GR.colormap()
        gr_set_viewport_plotarea()
    end
 end

 gr_view_xcenter() = 0.5 * (viewport_plotarea[1] + viewport_plotarea[2])
 gr_view_ycenter() = 0.5 * (viewport_plotarea[3] + viewport_plotarea[4])
+gr_view_xdiff() = viewport_plotarea[2] - viewport_plotarea[1]
+gr_view_ydiff() = viewport_plotarea[4] - viewport_plotarea[3]

-function gr_legend_pos(s::Symbol,w,h)
-    str = string(s)
-    if str == "best"
-        str = "topright"
-    end
-    if contains(str,"right")
-        xpos = viewport_plotarea[2] - 0.05 - w
-    elseif contains(str,"left")
-        xpos = viewport_plotarea[1] + 0.11
-    else
-        xpos = (viewport_plotarea[2]-viewport_plotarea[1])/2 - w/2 +.04
-    end
-    if contains(str,"top")
-        ypos = viewport_plotarea[4] - 0.06
-    elseif contains(str,"bottom")
-        ypos = viewport_plotarea[3] + h + 0.06
-    else
-        ypos = (viewport_plotarea[4]-viewport_plotarea[3])/2 + h/2
-    end
-    (xpos,ypos)
+function gr_pixels_to_ndc(x_pixels, y_pixels)
+    w,h = gr_plot_size
+    totx = w * gr_view_xdiff()
+    toty = h * gr_view_ydiff()
+    x_pixels / totx, y_pixels / toty
 end

-function gr_legend_pos{S<:Real, T<:Real}(v::Tuple{S,T},w,h)
-    xpos = v[1] * (viewport_plotarea[2] - viewport_plotarea[1]) + viewport_plotarea[1]
-    ypos = v[2] * (viewport_plotarea[4] - viewport_plotarea[3]) + viewport_plotarea[3]
-    (xpos,ypos)
-end

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

@@ -537,46 +498,12 @@ function gr_display(plt::Plot)
 end


-function _update_min_padding!(sp::Subplot{GRBackend})
-    leftpad   = 10mm
-    toppad    = 2mm
-    rightpad  = 2mm
-    bottompad = 6mm
-    if sp[:title] != ""
-        toppad += 5mm
-    end
-    if sp[:xaxis][:guide] != ""
-        xticks = axis_drawing_info(sp)[1]
-        if !(xticks in (nothing, false))
-            gr_set_font(sp[:xaxis][:tickfont],
-                        halign = (:left, :hcenter, :right)[sign(sp[:xaxis][:rotation]) + 2],
-                        valign = :top,
-                        color = sp[:xaxis][:foreground_color_axis],
-                        rotation = sp[:xaxis][:rotation])
-            h = 0
-            for (cv, dv) in zip(xticks...)
-                tbx, tby = gr_inqtext(0, 0, string(dv))
-                h = max(h, tby[2] - tby[1])
-            end
-            bottompad += 1mm + gr_plot_size[2] * h * px
-        else
-            bottompad += 4mm
-        end
-    end
-    if sp[:yaxis][:guide] != ""
-        leftpad += 4mm
-    end
-    sp.minpad = (leftpad, toppad, rightpad, bottompad)
-end
-
-
 function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
    # the viewports for this subplot
-    viewport_subplot = gr_viewport_from_bbox(sp, bbox(sp), w, h, viewport_canvas)
-    viewport_plotarea[:] = gr_viewport_from_bbox(sp, plotarea(sp), w, h, viewport_canvas)
+    viewport_subplot = gr_viewport_from_bbox(bbox(sp), w, h, viewport_canvas)
+    viewport_plotarea[:] = gr_viewport_from_bbox(plotarea(sp), w, h, viewport_canvas)
    # get data limits
    data_lims = gr_xy_axislims(sp)
-    xy_lims = data_lims

    ratio = sp[:aspect_ratio]
    if ratio != :none
@@ -618,11 +545,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        end
        if st == :heatmap
            outside_ticks = true
-            x, y = heatmap_edges(series[:x], sp[:xaxis][:scale]), heatmap_edges(series[:y], sp[:yaxis][:scale])
-            xy_lims = x[1], x[end], y[1], y[end]
-            expand_extrema!(sp[:xaxis], x)
-            expand_extrema!(sp[:yaxis], y)
-            data_lims = gr_xy_axislims(sp)
        end
    end

@@ -700,7 +622,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

    elseif ispolar(sp)
        r = gr_set_viewport_polar()
-        rmin, rmax = GR.adjustrange(ignorenan_minimum(r), ignorenan_maximum(r))
+        rmin, rmax = GR.adjustrange(minimum(r), maximum(r))
        # rmin, rmax = axis_limits(sp[:yaxis])
        gr_polaraxes(rmin, rmax)

@@ -724,24 +646,21 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

        # spine (border) and tick marks
        gr_set_line(1, :solid, sp[:xaxis][:foreground_color_axis])
-        GR.setclip(0)
        gr_polyline(coords(spine_segs)...)
-        GR.setclip(1)

        if !(xticks in (nothing, false))
            # x labels
            flip = sp[:yaxis][:flip]
            mirror = sp[:xaxis][:mirror]
            gr_set_font(sp[:xaxis][:tickfont],
-                        halign = (:left, :hcenter, :right)[sign(sp[:xaxis][:rotation]) + 2],
                        valign = (mirror ? :bottom : :top),
                        color = sp[:xaxis][:foreground_color_axis],
                        rotation = sp[:xaxis][:rotation])
            for (cv, dv) in zip(xticks...)
                # use xor ($) to get the right y coords
-                xi, yi = GR.wctondc(cv, xor(flip, mirror) ? ymax : ymin)
+                xi, yi = GR.wctondc(cv, (flip $ mirror) ? ymax : ymin)
                # @show cv dv ymin xi yi flip mirror (flip $ mirror)
-                gr_text(xi, yi + (mirror ? 1 : -1) * 5e-3, string(dv))
+                gr_text(xi, yi + (mirror ? 1 : -1) * 2e-3, string(dv))
            end
        end

@@ -751,16 +670,28 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            mirror = sp[:yaxis][:mirror]
            gr_set_font(sp[:yaxis][:tickfont],
                        halign = (mirror ? :left : :right),
-                        valign = (:top, :vcenter, :bottom)[sign(sp[:yaxis][:rotation]) + 2],
                        color = sp[:yaxis][:foreground_color_axis],
                        rotation = sp[:yaxis][:rotation])
            for (cv, dv) in zip(yticks...)
                # use xor ($) to get the right y coords
-                xi, yi = GR.wctondc(xor(flip, mirror) ? xmax : xmin, cv)
+                xi, yi = GR.wctondc((flip $ mirror) ? xmax : xmin, cv)
                # @show cv dv xmin xi yi
-                gr_text(xi + (mirror ? 1 : -1) * 1e-2, yi, string(dv))
+                gr_text(xi + (mirror ? 1 : -1) * 2e-3, yi, string(dv))
            end
        end
+
+        # window_diag = sqrt(gr_view_xdiff()^2 + gr_view_ydiff()^2)
+        # ticksize = 0.0075 * window_diag
+        # if outside_ticks
+        #     ticksize = -ticksize
+        # end
+        # # TODO: this should be done for each axis separately
+        # gr_set_linecolor(xaxis[:foreground_color_axis])
+
+        # x1, x2 = xaxis[:flip] ? (xmax,xmin) : (xmin,xmax)
+        # y1, y2 = yaxis[:flip] ? (ymax,ymin) : (ymin,ymax)
+        # GR.axes(xtick, ytick, x1, y1, 1, 1, ticksize)
+        # GR.axes(xtick, ytick, x2, y2, -1, -1, -ticksize)
    end
    # end

@@ -826,6 +757,10 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)

        # recompute data
        if typeof(z) <: Surface
+            # if st == :heatmap
+            #     expand_extrema!(sp[:xaxis], (x[1]-0.5*(x[2]-x[1]), x[end]+0.5*(x[end]-x[end-1])))
+            #     expand_extrema!(sp[:yaxis], (y[1]-0.5*(y[2]-y[1]), y[end]+0.5*(y[end]-y[end-1])))
+            # end
            z = vec(transpose_z(series, z.surf, false))
        elseif ispolar(sp)
            if frng != nothing
@@ -842,9 +777,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                    fr_from, fr_to = (is_2tuple(frng) ? frng : (y, frng))
                    for (i,rng) in enumerate(iter_segments(series[:x], series[:y]))
                        if length(rng) > 1
-                            gr_set_fillcolor(_cycle(series[:fillcolor], i))
-                            fx = _cycle(x, vcat(rng, reverse(rng)))
-                            fy = vcat(_cycle(fr_from,rng), _cycle(fr_to,reverse(rng)))
+                            gr_set_fillcolor(cycle(series[:fillcolor], i))
+                            fx = cycle(x, vcat(rng, reverse(rng)))
+                            fy = vcat(cycle(fr_from,rng), cycle(fr_to,reverse(rng)))
                            # @show i rng fx fy
                            GR.fillarea(fx, fy)
                        end
@@ -870,12 +805,12 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                isfinite(clims[1]) && (zmin = clims[1])
                isfinite(clims[2]) && (zmax = clims[2])
            end
-            GR.setspace(zmin, zmax, 0, 90)
            if typeof(series[:levels]) <: Array
                h = series[:levels]
            else
                h = linspace(zmin, zmax, series[:levels])
            end
+            GR.setspace(zmin, zmax, 0, 90)
            if series[:fillrange] != nothing
                GR.surface(x, y, z, GR.OPTION_CELL_ARRAY)
            else
@@ -885,7 +820,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            # create the colorbar of contour levels
            if sp[:colorbar] != :none
                gr_set_viewport_cmap(sp)
-                l = round.(Int32, 1000 + (h - ignorenan_minimum(h)) / (ignorenan_maximum(h) - ignorenan_minimum(h)) * 255)
+                l = round(Int32, 1000 + (h - minimum(h)) / (maximum(h) - minimum(h)) * 255)
                GR.setwindow(xmin, xmax, zmin, zmax)
                GR.cellarray(xmin, xmax, zmax, zmin, 1, length(l), l)
                ztick = 0.5 * GR.tick(zmin, zmax)
@@ -907,22 +842,19 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            cmap && gr_colorbar(sp)

        elseif st == :heatmap
-            xmin, xmax, ymin, ymax = xy_lims
            zmin, zmax = gr_lims(zaxis, true)
            clims = sp[:clims]
            if is_2tuple(clims)
                isfinite(clims[1]) && (zmin = clims[1])
                isfinite(clims[2]) && (zmax = clims[2])
            end
-            GR.setspace(zmin, zmax, 0, 90)
            grad = isa(series[:fillcolor], ColorGradient) ? series[:fillcolor] : cgrad()
            colors = [grad[clamp((zi-zmin) / (zmax-zmin), 0, 1)] for zi=z]
            rgba = map(c -> UInt32( round(Int, alpha(c) * 255) << 24 +
                                    round(Int,  blue(c) * 255) << 16 +
                                    round(Int, green(c) * 255) << 8  +
                                    round(Int,   red(c) * 255) ), colors)
-            w, h = length(x), length(y)
-            GR.drawimage(xmin, xmax, ymax, ymin, w, h, rgba)
+            GR.drawimage(xmin, xmax, ymax, ymin, length(x), length(y), rgba)
            cmap && gr_colorbar(sp)

        elseif st in (:path3d, :scatter3d)
@@ -945,7 +877,7 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            GR.selntran(0)
            GR.setfillintstyle(GR.INTSTYLE_SOLID)
            xmin, xmax, ymin, ymax = viewport_plotarea
-            ymax -= 0.1 * (xmax - xmin)
+            ymax -= 0.05 * (xmax - xmin)
            xcenter = 0.5 * (xmin + xmax)
            ycenter = 0.5 * (ymin + ymax)
            if xmax - xmin > ymax - ymin
@@ -998,19 +930,19 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
                    x, y = series[:x][rng], series[:y][rng]

                    # draw the interior
-                    gr_set_fill(_cycle(series[:fillcolor], i))
+                    gr_set_fill(cycle(series[:fillcolor], i))
                    GR.fillarea(x, y)

                    # draw the shapes
-                    gr_set_line(series[:linewidth], :solid, _cycle(series[:linecolor], i))
+                    gr_set_line(series[:linewidth], :solid, cycle(series[:linecolor], i))
                    GR.polyline(x, y)
                end
            end


        elseif st == :image
-            z = transpose_z(series, series[:z].surf, true)'
-            w, h = size(z)
+            z = transpose_z(series, series[:z].surf, true)
+            h, w = size(z)
            if eltype(z) <: Colors.AbstractGray
                grey = round(UInt8, float(z) * 255)
                rgba = map(c -> UInt32( 0xff000000 + Int(c)<<16 + Int(c)<<8 + Int(c) ), grey)
@@ -1043,11 +975,6 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
        w = 0
        i = 0
        n = 0
-        if sp[:legendtitle] != nothing
-            tbx, tby = gr_inqtext(0, 0, string(sp[:legendtitle]))
-            w = tbx[3] - tbx[1]
-            n += 1
-        end
        for series in series_list(sp)
            should_add_to_legend(series) || continue
            n += 1
@@ -1061,9 +988,9 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            w = max(w, tbx[3] - tbx[1])
        end
        if w > 0
+            xpos = viewport_plotarea[2] - 0.05 - w
+            ypos = viewport_plotarea[4] - 0.06
            dy = _gr_point_mult[1] * sp[:legendfont].pointsize * 1.75
-            h = dy*n
-            (xpos,ypos) = gr_legend_pos(sp[:legend],w,h)
            GR.setfillintstyle(GR.INTSTYLE_SOLID)
            gr_set_fillcolor(sp[:background_color_legend])
            GR.fillrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n)
@@ -1071,41 +998,24 @@ function gr_display(sp::Subplot{GRBackend}, w, h, viewport_canvas)
            GR.setlinewidth(1)
            GR.drawrect(xpos - 0.08, xpos + w + 0.02, ypos + dy, ypos - dy * n)
            i = 0
-            if sp[:legendtitle] != nothing
-                GR.settextalign(GR.TEXT_HALIGN_CENTER, GR.TEXT_VALIGN_HALF)
-                gr_set_textcolor(sp[:foreground_color_legend])
-                GR.settransparency(1)
-                gr_text(xpos - 0.03 + 0.5*w, ypos, string(sp[:legendtitle]))
-                ypos -= dy
-            end
            for series in series_list(sp)
                should_add_to_legend(series) || continue
                st = series[:seriestype]
                gr_set_line(series[:linewidth], series[:linestyle], series[:linecolor]) #, series[:linealpha])
-
-                if st == :shape || series[:fillrange] != nothing
+                if st == :path
+                    GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos])
+                elseif st == :shape
                    gr_set_fill(series[:fillcolor]) #, series[:fillalpha])
                    l, r = xpos-0.07, xpos-0.01
                    b, t = ypos-0.4dy, ypos+0.4dy
                    x = [l, r, r, l, l]
                    y = [b, b, t, t, b]
-                    GR.settransparency(gr_alpha(series[:fillalpha]))
                    gr_polyline(x, y, GR.fillarea)
-                    GR.settransparency(gr_alpha(series[:linealpha]))
-                    st == :shape && gr_polyline(x, y)
-                end
-
-                if st == :path
-                    GR.settransparency(gr_alpha(series[:linealpha]))
-                    if series[:fillrange] == nothing || series[:ribbon] != nothing
-                        GR.polyline([xpos - 0.07, xpos - 0.01], [ypos, ypos])
-                    else
-                        GR.polyline([xpos - 0.07, xpos - 0.01], [ypos+0.4dy, ypos+0.4dy])
-                    end
+                    gr_polyline(x, y)
                end

                if series[:markershape] != :none
-                    gr_draw_markers(series, xpos - .035, ypos, 6, nothing)
+                    gr_draw_markers(series, xpos-[0.06,0.02], [ypos,ypos], 10, nothing)
                end

                if typeof(series[:label]) <: Array
@@ -1167,14 +1077,14 @@ else
    "use_default"
 end

-const _gr_wstype = Ref(get(ENV, "GKSwstype", _gr_wstype_default))
+const _gr_wstype = Ref(get(ENV, "GKS_WSTYPE", _gr_wstype_default))
 gr_set_output(wstype::String) = (_gr_wstype[] = wstype)

 for (mime, fmt) in _gr_mimeformats
    @eval function _show(io::IO, ::MIME{Symbol($mime)}, plt::Plot{GRBackend})
        GR.emergencyclosegks()
        filepath = tempname() * "." * $fmt
-        ENV["GKSwstype"] = $fmt
+        ENV["GKS_WSTYPE"] = $fmt
        ENV["GKS_FILEPATH"] = filepath
        gr_display(plt)
        GR.emergencyclosegks()
@@ -1187,17 +1097,17 @@ function _display(plt::Plot{GRBackend})
    if plt[:display_type] == :inline
        GR.emergencyclosegks()
        filepath = tempname() * ".pdf"
-        ENV["GKSwstype"] = "pdf"
+        ENV["GKS_WSTYPE"] = "pdf"
        ENV["GKS_FILEPATH"] = filepath
        gr_display(plt)
        GR.emergencyclosegks()
-        content = string("\033]1337;File=inline=1;preserveAspectRatio=0:", base64encode(open(read, filepath)), "\a")
+        content = string("\033]1337;File=inline=1;preserveAspectRatio=0:", base64encode(open(readbytes, filepath)), "\a")
        println(content)
        rm(filepath)
    else
        ENV["GKS_DOUBLE_BUF"] = true
        if _gr_wstype[] != "use_default"
-            ENV["GKSwstype"] = _gr_wstype[]
+            ENV["GKS_WSTYPE"] = _gr_wstype[]
        end
        gr_display(plt)
    end
@@ -1,655 +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.
-==#
-
-
-import FixedPointNumbers: N0f8 #In core Julia
-
-#Dispatch types:
-immutable HDF5PlotNative; end #Indentifies a data element that can natively be handled by HDF5
-immutable HDF5CTuple; end #Identifies a "complex" tuple structure
-
-type 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{T<:Any}(grp, ::Type{Array{T}})
-    tstr = HDF5PLOT_MAP_TELEM2STR[Array] #ANY
-    HDF5.a_write(grp, _hdf5plot_datatypeid, tstr)
-end
-function _hdf5plot_writetype{T<:BoundingBox}(grp, ::Type{T})
-    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{T<:Number}(grp, k::String, v::Array{T}) #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{T}(grp, k::String, v::Array{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{T}(grp, k::String, v::Length{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
@@ -1,528 +0,0 @@
-
-# https://github.com/ma-laforge/InspectDR.jl
-
-#=TODO:
-    Tweak scale factor for width & other sizes
-
-Not supported by InspectDR:
-    :foreground_color_grid
-    :foreground_color_border
-    :polar,
-
-Add in functionality to Plots.jl:
-    :aspect_ratio,
-=#
-
-# ---------------------------------------------------------------------------
-#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_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
-    :label,
-    :linecolor, :linestyle, :linewidth, :linealpha,
-    :markershape, :markercolor, :markersize, :markeralpha,
-    :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
-    :markerstrokestyle, #Causes warning not to have it... what is this?
-    :fillcolor, :fillalpha, #:fillrange,
-#    :bins, :bar_width, :bar_edges, :bar_position,
-    :title, :title_location, :titlefont,
-    :window_title,
-    :guide, :lims, :scale, #:ticks, :flip, :rotation,
-    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, #:colorbar,
-#    :marker_z,
-#    :line_z,
-#    :levels,
- #   :ribbon, :quiver, :arrow,
-#    :orientation,
-    :overwrite_figure,
-    :polar,
-#    :normalize, :weights,
-#    :contours, :aspect_ratio,
-    :match_dimensions,
-#    :clims,
-#    :inset_subplots,
-    :dpi,
-#    :colorbar_title,
-  ])
-const _inspectdr_style = [:auto, :solid, :dash, :dot, :dashdot]
-const _inspectdr_seriestype = [
-        :path, :scatter, :shape #, :steppre, :steppost
-    ]
-#see: _allMarkers, _shape_keys
-const _inspectdr_marker = Symbol[
-    :none, :auto,
-    :circle, :rect, :diamond,
-    :cross, :xcross,
-    :utriangle, :dtriangle, :rtriangle, :ltriangle,
-    :pentagon, :hexagon, :heptagon, :octagon,
-    :star4, :star5, :star6, :star7, :star8,
-    :vline, :hline, :+, :x,
-]
-
-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
-    return s
-end
-
-function _inspectdr_mapglyph(s::Shape)
-    x, y = coords(s)
-    return InspectDR.GlyphPolyline(x, y)
-end
-
-# py_marker(markers::AVec) = map(py_marker, markers)
-function _inspectdr_mapglyph(markers::AVec)
-    warn("Vectors of markers are currently unsupported in InspectDR.")
-    _inspectdr_mapglyph(markers[1])
-end
-
-_inspectdr_mapglyphsize(v::Real) = v
-function _inspectdr_mapglyphsize(v::Vector)
-    warn("Vectors of marker sizes are currently unsupported in InspectDR.")
-    _inspectdr_mapglyphsize(v[1])
-end
-
-_inspectdr_mapcolor(v::Colorant) = v
-function _inspectdr_mapcolor(g::PlotUtils.ColorGradient)
-    warn("Color gradients are currently unsupported in InspectDR.")
-    #Pick middle color:
-    _inspectdr_mapcolor(g.colors[div(1+end,2)])
-end
-function _inspectdr_mapcolor(v::AVec)
-    warn("Vectors of colors are currently unsupported in InspectDR.")
-    #Pick middle color:
-    _inspectdr_mapcolor(v[div(1+end,2)])
-end
-
-#Hack: suggested point size does not seem adequate relative to plot size, for some reason.
-_inspectdr_mapptsize(v) = 1.5*v
-
-function _inspectdr_add_annotations(plot, x, y, val)
-    #What kind of annotation is this?
-end
-
-#plot::InspectDR.Plot2D
-function _inspectdr_add_annotations(plot, x, y, val::PlotText)
-    vmap = Dict{Symbol, Symbol}(:top=>:t, :bottom=>:b) #:vcenter
-    hmap = Dict{Symbol, Symbol}(:left=>:l, :right=>:r) #:hcenter
-    align = Symbol(get(vmap, val.font.valign, :c), get(hmap, val.font.halign, :c))
-    fnt = InspectDR.Font(val.font.family, val.font.pointsize,
-        color =_inspectdr_mapcolor(val.font.color)
-    )
-    ann = InspectDR.atext(val.str, x=x, y=y,
-        font=fnt, angle=val.font.rotation, align=align
-    )
-    InspectDR.add(plot, ann)
-    return
-end
-
-# ---------------------------------------------------------------------------
-
-function _inspectdr_getscale(s::Symbol, yaxis::Bool)
-#TODO: Support :asinh, :sqrt
-    kwargs = yaxis? (:tgtmajor=>8, :tgtminor=>2): () #More grid lines on y-axis
-    if :log2 == s
-        return InspectDR.AxisScale(:log2; kwargs...)
-    elseif :log10 == s
-        return InspectDR.AxisScale(:log10; kwargs...)
-    elseif :ln == s
-        return InspectDR.AxisScale(:ln; kwargs...)
-    else #identity
-        return InspectDR.AxisScale(:lin; kwargs...)
-    end
-end
-
-# ---------------------------------------------------------------------------
-
-function add_backend_string(::InspectDRBackend)
-    """
-    if !Plots.is_installed("InspectDR")
-        Pkg.add("InspectDR")
-    end
-    """
-end
-
-function _initialize_backend(::InspectDRBackend; kw...)
-    @eval begin
-        import InspectDR
-        export InspectDR
-
-        #Glyph used when plotting "Shape"s:
-        const INSPECTDR_GLYPH_SHAPE = InspectDR.GlyphPolyline(
-            2*InspectDR.GLYPH_SQUARE.x, InspectDR.GLYPH_SQUARE.y
-        )
-
-        type InspecDRPlotRef
-            mplot::Union{Void, InspectDR.Multiplot}
-            gui::Union{Void, InspectDR.GtkPlot}
-        end
-
-        _inspectdr_getmplot(::Any) = nothing
-        _inspectdr_getmplot(r::InspecDRPlotRef) = r.mplot
-
-        _inspectdr_getgui(::Any) = nothing
-        _inspectdr_getgui(gplot::InspectDR.GtkPlot) = (gplot.destroyed? nothing: gplot)
-        _inspectdr_getgui(r::InspecDRPlotRef) = _inspectdr_getgui(r.gui)
-    end
-end
-
-# ---------------------------------------------------------------------------
-
-# Create the window/figure for this backend.
-function _create_backend_figure(plt::Plot{InspectDRBackend})
-    mplot = _inspectdr_getmplot(plt.o)
-    gplot = _inspectdr_getgui(plt.o)
-
-    #:overwrite_figure: want to reuse current figure
-    if plt[:overwrite_figure] && mplot != nothing
-        mplot.subplots = [] #Reset
-        if gplot != nothing #Ensure still references current plot
-            gplot.src = mplot
-        end
-    else #want new one:
-        mplot = InspectDR.Multiplot()
-        gplot = nothing #Will be created later
-    end
-
-    #break link with old subplots
-    for sp in plt.subplots
-        sp.o = nothing
-    end
-
-    return InspecDRPlotRef(mplot, gplot)
-end
-
-# ---------------------------------------------------------------------------
-
-# # this is called early in the pipeline, use it to make the plot current or something
-# function _prepare_plot_object(plt::Plot{InspectDRBackend})
-# 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"
-    return plot
-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{InspectDRBackend}, series::Series)
-    st = series[:seriestype]
-    sp = series[:subplot]
-    plot = sp.o
-
-    #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
-    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
-        series[:x] = Float64[x[mod1(i,nx)] for i=1:ny]
-    elseif ny > nx
-        series[:y] = Float64[y[mod1(i,ny)] for i=1:nx]
-    end
-
-#= TODO: Eventually support
-    series[:fillcolor] #I think this is fill under line
-    zorder = series[:series_plotindex]
-
-For st in :shape:
-    zorder = series[:series_plotindex],
-=#
-
-    if st in (:shape,)
-        nmax = 0
-        for (i,rng) in enumerate(iter_segments(x, y))
-            nmax = i
-            if length(rng) > 1
-                linewidth = series[:linewidth]
-                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)
-            end
-        end
-
-        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))
-            wfrm = InspectDR.add(plot, Float64[], Float64[], id=series[:label])
-            wfrm.line = InspectDR.line(
-                style=:none, width=linewidth, #linewidth affects glyph
-            )
-            wfrm.glyph = InspectDR.glyph(
-                shape = INSPECTDR_GLYPH_SHAPE, size = 8,
-                color = linecolor, fillcolor = fillcolor
-            )
-        end
-   elseif st in (:path, :scatter) #, :steppre, :steppost)
-        #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])
-        wfrm = InspectDR.add(plot, x, y, id=series[:label])
-        wfrm.line = InspectDR.line(
-            style = _style,
-            width = series[:linewidth],
-            color = series[:linecolor],
-        )
-        #InspectDR does not control markerstrokewidth independently.
-        if :none == _style
-            #Use this property only if no line is displayed:
-            wfrm.line.width = series[:markerstrokewidth]
-        end
-        wfrm.glyph = InspectDR.glyph(
-            shape = _inspectdr_mapglyph(series[:markershape]),
-            size = _inspectdr_mapglyphsize(series[:markersize]),
-            color = _inspectdr_mapcolor(series[:markerstrokecolor]),
-            fillcolor = _inspectdr_mapcolor(series[:markercolor]),
-        )
-    end
-
-    # this is all we need to add the series_annotations text
-    anns = series[:series_annotations]
-    for (xi,yi,str,fnt) in EachAnn(anns, x, y)
-        _inspectdr_add_annotations(plot, xi, yi, PlotText(str, fnt))
-    end
-    return
-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{InspectDRBackend}, series::Series)
-    #Nothing to do
-end
-
-# ---------------------------------------------------------------------------
-
-function _inspectdr_setupsubplot(sp::Subplot{InspectDRBackend})
-    const gridon = InspectDR.GridRect(vmajor=true, hmajor=true)
-    const gridoff = InspectDR.GridRect()
-    const plot = sp.o
-    const strip = plot.strips[1] #Only 1 strip supported with Plots.jl
-
-	#No independent control of grid???
-	strip.grid = sp[:grid]? gridon: gridoff
-
-    xaxis = sp[:xaxis]; yaxis = sp[:yaxis]
-        plot.xscale = _inspectdr_getscale(xaxis[:scale], false)
-        strip.yscale = _inspectdr_getscale(yaxis[:scale], true)
-        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)
-    a = plot.annotation
-        a.title = sp[:title]
-        a.xlabel = xaxis[:guide]; a.ylabels = [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[: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[:guidefont].family,
-            _inspectdr_mapptsize(xaxis[:guidefont].pointsize),
-            color = _inspectdr_mapcolor(xaxis[:foreground_color_guide])
-        )
-        l[:font_ticklabel] = 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[:legendfont].family,
-            _inspectdr_mapptsize(sp[:legendfont].pointsize),
-            color = _inspectdr_mapcolor(sp[:foreground_color_legend])
-        )
-        l[:frame_legend].fillcolor = _inspectdr_mapcolor(sp[:background_color_legend])
-end
-
-# called just before updating layout bounding boxes... in case you need to prep
-# for the calcs
-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)
-        if !isassigned(mplot.subplots, i)
-            mplot.subplots[i] = InspectDR.Plot2D()
-        end
-        sp.o = mplot.subplots[i]
-        plot = sp.o
-        _initialize_subplot(plt, sp)
-        _inspectdr_setupsubplot(sp)
-
-        # add the annotations
-        for ann in sp[:annotations]
-            _inspectdr_add_annotations(plot, 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
-    elseif nsubplots <= 4
-        mplot.layout[:ncolumns] = 2
-    elseif nsubplots <= 6
-        mplot.layout[:ncolumns] = 3
-    elseif nsubplots <= 12
-        mplot.layout[:ncolumns] = 4
-    else
-        mplot.layout[:ncolumns] = 5
-    end
-
-    for series in plt.series_list
-        _series_added(plt, series)
-    end
-    return
-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)
-end
-
-# ----------------------------------------------------------------
-
-# Override this to update plot items (title, xlabel, etc), and add annotations (d[:annotations])
-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
-
-    gplot.src = mplot #Ensure still references current plot
-    InspectDR.refresh(gplot)
-    return
-end
-
-# ----------------------------------------------------------------
-
-const _inspectdr_mimeformats_dpi = Dict(
-    "image/png"               => "png"
-)
-const _inspectdr_mimeformats_nodpi = Dict(
-    "image/svg+xml"           => "svg",
-    "application/eps"         => "eps",
-    "image/eps"               => "eps",
-#    "application/postscript"  => "ps", #TODO: support once Cairo supports PSSurface
-    "application/pdf"         => "pdf"
-)
-_inspectdr_show(io::IO, mime::MIME, ::Void, w, h) =
-    throw(ErrorException("Cannot show(::IO, ...) plot - not yet generated"))
-function _inspectdr_show(io::IO, mime::MIME, mplot, w, h)
-    InspectDR._show(io, mime, mplot, Float64(w), Float64(h))
-end
-
-for (mime, fmt) in _inspectdr_mimeformats_dpi
-    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
-        dpi = plt[:dpi]#TODO: support
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
-    end
-end
-for (mime, fmt) in _inspectdr_mimeformats_nodpi
-    @eval function _show(io::IO, mime::MIME{Symbol($mime)}, plt::Plot{InspectDRBackend})
-        _inspectdr_show(io, mime, _inspectdr_getmplot(plt.o), plt[:size]...)
-    end
-end
-_show(io::IO, mime::MIME"text/plain", plt::Plot{InspectDRBackend}) = nothing #Don't show
-
-# ----------------------------------------------------------------
-
-# Display/show the plot (open a GUI window, or browser page, for example).
-function _display(plt::Plot{InspectDRBackend})
-    mplot = _inspectdr_getmplot(plt.o)
-    if nothing == mplot; return; end
-    gplot = _inspectdr_getgui(plt.o)
-
-    if nothing == gplot
-        gplot = display(InspectDR.GtkDisplay(), mplot)
-    else
-        #redundant... Plots.jl will call _update_plot_object:
-        #InspectDR.refresh(gplot)
-    end
-    plt.o = InspecDRPlotRef(mplot, gplot)
-    return gplot
-end
@@ -3,7 +3,7 @@
 # significant contributions by: @pkofod

 const _pgfplots_attr = merge_with_base_supported([
-    :annotations,
+    # :annotations,
    # :background_color_legend,
    :background_color_inside,
    # :background_color_outside,
@@ -22,17 +22,17 @@ 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,
  ])
-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] #vcat(_allMarkers, Shape)
 const _pgfplots_scale = [:identity, :ln, :log2, :log10]
@@ -98,35 +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"
-)
-
 # --------------------------------------------------------------------------------------

 # 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"
@@ -157,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)
@@ -177,10 +143,11 @@ 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

@@ -196,10 +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]
    else
        d[:x], d[:y]
    end
@@ -248,9 +211,6 @@ function pgf_axis(sp::Subplot, letter)
    # 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")

@@ -289,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()

@@ -309,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"
@@ -334,62 +288,19 @@ function _update_plot_object(plt::Plot{PGFPlotsBackend})
            kw[:legendPos] = _pgfplots_legend_pos[legpos]
        end

-        axisf = PGFPlots.Axis
-        if sp[:projection] == :polar
-            axisf = PGFPlots.PolarAxis
-        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
@@ -403,18 +314,12 @@ function _show(io::IO, mime::MIME"application/pdf", plt::Plot{PGFPlotsBackend})
    PGFPlots.save(PGFPlots.PDF(fn), pgfplt)

    # read it into io
-    write(io, readstring(open(fn)))
+    write(io, readall(open(fn)))

    # cleanup
    PGFPlots.cleanup(plt.o)
 end

-function _show(io::IO, mime::MIME"application/x-tex", plt::Plot{PGFPlotsBackend})
-    fn = tempname()*".tex"
-    PGFPlots.save(fn, backend_object(plt), include_preamble=false)
-    write(io, readstring(open(fn)))
-end
-
 function _display(plt::Plot{PGFPlotsBackend})
    # prepare the object
    pgfplt = PGFPlots.plot(plt.o)
@@ -19,8 +19,8 @@ const _plotly_attr = merge_with_base_supported([
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, :colorbar, :colorbar_title,
-    :marker_z, :fill_z, :levels,
+    :grid, :legend, :colorbar,
+    :marker_z, :levels,
    :ribbon, :quiver,
    :orientation,
    # :overwrite_figure,
@@ -31,7 +31,6 @@ const _plotly_attr = merge_with_base_supported([
    :hover,
    :inset_subplots,
    :bar_width,
-    :clims,
  ])

 const _plotly_seriestype = [
@@ -269,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[]

@@ -372,7 +371,6 @@ end
 plotly_colorscale(c, α) = plotly_colorscale(cgrad(alpha=α), α)
 # plotly_colorscale(c, alpha = nothing) = plotly_colorscale(cgrad(), alpha)

-
 const _plotly_markers = KW(
    :rect       => "square",
    :xcross     => "x",
@@ -409,10 +407,6 @@ 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]
@@ -435,7 +429,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)

    # for surface types, set the data
    if st in (:heatmap, :contour, :surface, :wireframe)
@@ -444,13 +437,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"
@@ -462,11 +448,8 @@ function plotly_series(plt::Plot, series::Series)
        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

@@ -483,7 +466,6 @@ function plotly_series(plt::Plot, series::Series)
        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] = sp[:legend] != :none

    elseif st == :contour
        d_out[:type] = "contour"
@@ -492,7 +474,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] = sp[:legend] != :none

    elseif st in (:surface, :wireframe)
        d_out[:type] = "surface"
@@ -505,14 +486,8 @@ 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] = sp[:legend] != :none
        end

    elseif st == :pie
@@ -554,10 +529,9 @@ function plotly_series(plt::Plot, series::Series)
            rgba_string(series[:markercolor])
        else
            # grad = ColorGradient(series[:markercolor], alpha=series[:markeralpha])
-            grad = as_gradient(series[:markercolor], series[:markeralpha])
-            zmin, zmax = ignorenan_extrema(series[:marker_z])
-            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)
-            [rgba_string(grad[(zi - zmin) / zrange]) for zi in series[:marker_z]]
+            grad = series[:markercolor]
+            zmin, zmax = extrema(series[:marker_z])
+            [rgba_string(grad[(zi - zmin) / (zmax - zmin)]) for zi in series[:marker_z]]
        end
    end

@@ -581,19 +555,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 = copy(d_out)
-        d_out_fillrange[:y] = series[:fillrange]
-        d_out_fillrange[:showlegend] = false
-        delete!(d_out_fillrange, :fill)
-        delete!(d_out_fillrange, :fillcolor)
-
-        return [d_out_fillrange, d_out]
-    else
-        return [d_out]
-    end
+    [d_out]
 end

 function plotly_series_shapes(plt::Plot, series::Series)
@@ -621,18 +583,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
@@ -102,18 +102,8 @@ _show(io::IO, ::MIME"image/png", plt::Plot{PlotlyJSBackend}) = plotlyjs_save_hac
 _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


@@ -17,8 +17,9 @@ const _pyplot_attr = merge_with_base_supported([
    :window_title,
    :guide, :lims, :ticks, :scale, :flip, :rotation,
    :tickfont, :guidefont, :legendfont,
-    :grid, :legend, :legendtitle, :colorbar,
-    :marker_z, :line_z, :fill_z,
+    :grid, :legend, :colorbar,
+    :marker_z,
+    :line_z,
    :levels,
    :ribbon, :quiver, :arrow,
    :orientation,
@@ -55,8 +56,6 @@ function add_backend_string(::PyPlotBackend)
    withenv("PYTHON" => "") do
        Pkg.build("PyPlot")
    end
-
-    # now restart julia!
    """
 end

@@ -70,30 +69,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

 # --------------------------------------------------------------------------------------
@@ -109,7 +100,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
@@ -126,16 +117,16 @@ 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
 py_colormap(c) = py_colormap(cgrad())


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

@@ -159,7 +150,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)
@@ -185,7 +176,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
@@ -227,22 +218,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)
@@ -264,9 +249,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

 # ---------------------------------------------------------------------------
@@ -497,30 +482,30 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                    extrakw = KW()
                    isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
                    isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
-                    kw[:norm] = pycolors["Normalize"](; extrakw...)
+                    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
-                        push!(segments, [(_cycle(x,i),_cycle(y,i),_cycle(z,i)) for i in rng])
+                        push!(segments, [(cycle(x,i),cycle(y,i),cycle(z,i)) for i in rng])
                    end
                    # 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))]
+                    #     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 = 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
-                        push!(segments, [(_cycle(x,i),_cycle(y,i)) for i in rng])
+                        push!(segments, [(cycle(x,i),cycle(y,i)) for i in rng])
                    end
                    # for i=1:n
-                    #     segments[i] = [(_cycle(x,i), _cycle(y,i)), (_cycle(x,i+1), _cycle(y,i+1))]
+                    #     segments[i] = [(cycle(x,i), cycle(y,i)), (cycle(x,i+1), cycle(y,i+1))]
                    # end
-                    lc = pycollections["LineCollection"](segments; kw...)
+                    lc = pycollections.LineCollection(segments; kw...)
                    lc[:set_array](lz)
                    ax[:add_collection](lc)
                    lc
@@ -589,16 +574,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...
@@ -683,21 +668,21 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
                x = repmat(x', length(y), 1)
                y = repmat(y, 1, length(series[:x]))
            end
+            # z = z'
            z = transpose_z(series, z)
            if st == :surface
-                clims = sp[:clims]
-                if is_2tuple(clims)
-                    isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
-                    isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
-                end
-                if series[:fill_z] != nothing
-                    # the surface colors are different than z-value
-                    extrakw[:facecolors] = py_shading(series[:fillcolor], transpose_z(series, series[:fill_z].surf))
+                if series[:marker_z] != nothing
+                    extrakw[:facecolors] = py_shading(series[:fillcolor], series[:marker_z], series[:fillalpha])
                    extrakw[:shade] = false
+                    clims = sp[:clims]
+                    if is_2tuple(clims)
+                        isfinite(clims[1]) && (extrakw[:vmin] = clims[1])
+                        isfinite(clims[2]) && (extrakw[:vmax] = clims[2])
+                    end
                else
                    extrakw[:cmap] = py_fillcolormap(series)
+                    needs_colorbar = true
                end
-                needs_colorbar = true
            end
            handle = ax[st == :surface ? :plot_surface : :plot_wireframe](x, y, z;
                label = series[:label],
@@ -713,11 +698,11 @@ 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
@@ -776,7 +761,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)
@@ -786,7 +771,7 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
        end

        clims = sp[:clims]
-        zmin, zmax = ignorenan_extrema(z)
+        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

@@ -805,13 +790,13 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
        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
                )
@@ -880,7 +865,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
@@ -934,14 +919,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
@@ -962,7 +947,7 @@ function py_set_scale(ax, axis::Axis)
        elseif scale == :log10
            10
        end
-        kw[Symbol(:linthresh,letter)] = NaNMath.max(1e-16, py_compute_axis_minval(axis))
+        kw[Symbol(:linthresh,letter)] = max(1e-16, py_compute_axis_minval(axis))
        "symlog"
    end
    func(arg; kw...)
@@ -993,7 +978,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
@@ -1066,7 +1051,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
            end
            if sp[:grid]
                fgcolor = py_color(sp[:foreground_color_grid])
-                pyaxis[:grid](true, color = fgcolor, linestyle = ":")
+                pyaxis[:grid](true, color = fgcolor)
                ax[:set_axisbelow](true)
            end
            py_set_axis_colors(ax, axis)
@@ -1082,7 +1067,7 @@ function _before_layout_calcs(plt::Plot{PyPlotBackend})
        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
@@ -1114,7 +1099,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

@@ -1174,7 +1159,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                # add a line/marker and a label
                push!(handles, if series[:seriestype] == :shape
                    PyPlot.plt[:Line2D]((0,1),(0,0),
-                        color = py_color(_cycle(series[:fillcolor],1)),
+                        color = py_color(cycle(series[:fillcolor],1)),
                        linewidth = py_dpi_scale(plt, 4)
                    )
                else
@@ -1195,7 +1180,6 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                # framealpha = 0.6
            )
            leg[:set_zorder](1000)
-            sp[:legendtitle] != nothing && leg[:set_title](sp[:legendtitle])

            fgcolor = py_color(sp[:foreground_color_legend])
            for txt in leg[:get_texts]()
@@ -1204,7 +1188,7 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)

            # 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
@@ -1228,8 +1212,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
@@ -23,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 FixedSizeArrays.Vec{2,Float64}
+typealias P3 FixedSizeArrays.Vec{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))
@@ -174,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)
@@ -184,7 +184,7 @@ function scale!(shape::Shape, x::Real, y::Real = x, c = center(shape))
    shape
 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))
    shapecopy = deepcopy(shape)
    scale!(shapecopy, x, y, c)
 end
@@ -248,7 +248,7 @@ end
 function font(args...)

  # defaults
-  family = "sans-serif"
+  family = "Helvetica"
  pointsize = 14
  halign = :hcenter
  valign = :vcenter
@@ -297,33 +297,12 @@ function scalefontsize(k::Symbol, factor::Number)
    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 (:titlefont, :guidefont, :tickfont, :legendfont)
        scalefontsize(k, factor)
    end
 end

-"""
-    scalefontsizes()
-
-Resets font sizes to initial default values.
-"""
-function scalefontsizes()
-  for k in (:titlefont, :guidefont, :tickfont, :legendfont)
-      f = default(k)
-      if k in keys(_initial_fontsizes)
-        factor = f.pointsize / _initial_fontsizes[k]
-        scalefontsize(k, 1.0/factor)
-      end
-  end
-end
-
 "Wrap a string with font info"
 immutable PlotText
  str::AbstractString
@@ -467,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)
@@ -483,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
@@ -500,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) = []
@@ -522,13 +501,13 @@ immutable ZValues
  zrange::Tuple{Float64,Float64}
 end

-function zvalues{T<:Real}(values::AVec{T}, zrange::Tuple{T,T} = (ignorenan_minimum(values), ignorenan_maximum(values)))
+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"
 immutable Surface{M<:AMat} <: AbstractSurface
@@ -542,7 +521,7 @@ 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.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)
@@ -666,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::FixedSizeArrays.Vec{N,T}...) = sum(ps) / length(ps)

@deprecate curve_points coords

@@ -680,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
@@ -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
@@ -1,5 +1,5 @@

-abstract type ColorScheme end
+abstract ColorScheme

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

@@ -5,7 +5,7 @@
 # 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 = @compat(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))

@@ -41,7 +41,7 @@ PlotExample("Colors",
    [:(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")
+        scatter!(y, zcolor=abs(y-.5), m=(:heat,0.8,stroke(1,:green)), ms=10*abs(y-0.5)+4, lab="grad")
    end)]
 ),

@@ -66,8 +66,8 @@ PlotExample("Global",
 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)]
 ),
@@ -115,22 +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
+        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), legendtitle = "linestyle")
+        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)]
 ),
@@ -216,7 +214,7 @@ PlotExample("Contours",
        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)
@@ -270,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)]
 ),
@@ -280,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)]
 ),
@@ -302,32 +300,7 @@ PlotExample("Boxplot and Violin series recipes",
        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`. As always, the marker shape and size can be changed with `spy(mat, markersize = 3, markershape = :star)`",
-    [:(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, markershape = :dtriangle), spy(b), markersize = 3, title = ["Unique nonzeros" "Different nonzeros"])
-    end)]
-),
+)

 ]

@@ -9,8 +9,8 @@ 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
@@ -704,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
@@ -154,7 +154,6 @@ const _mimeformats = Dict(
    "application/postscript"  => "ps",
    "image/svg+xml"           => "svg",
    "text/plain"              => "txt",
-    "application/x-tex"       => "tex",
 )

 const _best_html_output_type = KW(
@@ -220,10 +219,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)
@@ -246,26 +249,27 @@ end

 const _ijulia_output = String["text/html"]

-using Requires
-@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
-
        set_ijulia_output("text/html")
    end
 end
@@ -273,48 +277,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{B}(io::IO, m::MIME"text/plain", plt::Plot{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
@@ -153,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,
@@ -262,7 +262,7 @@ 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
@@ -277,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
@@ -364,7 +357,7 @@ 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
 end
@@ -60,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
@@ -1,56 +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
-
-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{T}(d::KW, ::Type{T}, plt::AbstractPlot) = throw(MethodError("Unmatched plot recipe: $T"))
+RecipesBase.apply_recipe{T}(d::KW, ::Type{T}, plt::Plot) = throw(MethodError("Unmatched plot recipe: $T"))

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

@@ -176,14 +225,14 @@ end
        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
@@ -235,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
@@ -274,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(d, x, y)
-    nx, ny = length(procx), length(procy)
+    nx, ny = length(x), length(y)
    axis = d[:subplot][isvertical(d) ? :xaxis : :yaxis]
-    cv = [discrete_value!(axis, xi)[1] for xi=procx]
-    procx = if nx == ny
+    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]
@@ -289,9 +337,9 @@ end
    # compute half-width of bars
    bw = d[:bar_width]
    hw = if bw == nothing
-        0.5ignorenan_mean(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
@@ -299,25 +347,20 @@ end
    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(d)
@@ -335,326 +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{T}(::Type{T}, x::Real) = _is_positive(x) ? T(x) : T(NaN)
-
-function _scale_adjusted_values{T<:AbstractFloat}(::Type{T}, V::AbstractVector, scale::Symbol)
-    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{T<:Real}(min_value::T, scale::Symbol)
-    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{T<:AbstractFloat}(::Type{T}, w, wscale::Symbol)
-    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(d, x, y)
-    if (d[: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(d, 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 = d[:subplot][Plots.isvertical(d) ? :xaxis : :yaxis]
-
-    edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, x, y)
-
-    xpts, ypts = _stepbins_path(edge, weights, baseline, xscale, yscale)
-    if !isvertical(d)
-        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 d[: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
-
-
-function _auto_binning_nbins{N}(vs::NTuple{N,AbstractVector}, dim::Integer; mode::Symbol = :auto)
-    _cl(x) = ceil(Int, NaNMath.max(x, one(x)))
-    _iqr(v) = quantile(v, 0.75) - quantile(v, 0.25)
-    _span(v) = ignorenan_maximum(v) - ignorenan_minimum(v)
-
-    n_samples = length(linearindices(first(vs)))
-    # Estimator for number of samples in one row/column of bins along each axis:
-    n = max(1, n_samples^(1/N))
-
-    v = vs[dim]
-
-    if mode == :auto
-        30
-    elseif mode == :sqrt  # Square-root choice
-        _cl(sqrt(n))
-    elseif mode == :sturges  # Sturges' formula
-        _cl(log2(n)) + 1
-    elseif mode == :rice  # Rice Rule
-        _cl(2 * n^(1/3))
-    elseif mode == :scott  # Scott's normal reference rule
-        _cl(_span(v) / (3.5 * std(v) / n^(1/3)))
-    elseif mode == :fd  # Freedman–Diaconis rule
-        _cl(_span(v) / (2 * _iqr(v) / n^(1/3)))
-    else
-        error("Unknown auto-binning mode $mode")
-    end::Int
-end
-
-_hist_edge{N}(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Integer) = StatsBase.histrange(vs[dim], binning, :left)
-_hist_edge{N}(vs::NTuple{N,AbstractVector}, dim::Integer, binning::Symbol) = _hist_edge(vs, dim, _auto_binning_nbins(vs, dim, mode = binning))
-_hist_edge{N}(vs::NTuple{N,AbstractVector}, dim::Integer, binning::AbstractVector) = binning
-
-_hist_edges{N}(vs::NTuple{N,AbstractVector}, binning::NTuple{N}) =
-    map(dim -> _hist_edge(vs, dim, binning[dim]), (1:N...))
-
-_hist_edges{N}(vs::NTuple{N,AbstractVector}, binning::Union{Integer, Symbol, AbstractVector}) =
-    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{N}(vs::NTuple{N,AbstractVector}, binning; normed = false, weights = nothing)
-    edges = _hist_edges(vs, binning)
-    h = float( weights == nothing ?
-        StatsBase.fit(StatsBase.Histogram, vs, edges, closed = :left) :
-        StatsBase.fit(StatsBase.Histogram, vs, 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 := :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,), d[:bins], normed = d[:normalize], weights = d[: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,), d[:bins], normed = d[:normalize], weights = d[: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,), d[:bins], normed = d[:normalize], weights = d[:weights])
-    x := h.edges[1]
-    y := h.weights
-    seriestype := :scatterbins
-    ()
-end
-@deps scatterhist scatterbins
-
-
-@recipe function f{T, E}(h::StatsBase.Histogram{T, 1, 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, d[:seriestype], d[:seriestype])
-
-    if d[:seriestype] == :scatterbins
-        # Workaround, error bars currently not set correctly by scatterbins
-        edge, weights, xscale, yscale, baseline = _preprocess_binlike(d, 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{H <: StatsBase.Histogram}(hv::AbstractVector{H})
-    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), d[:bins], normed = d[:normalize], weights = d[:weights])
-    x := h.edges[1]
-    y := h.edges[2]
-    z := Surface(h.weights)
-    seriestype := :bins2d
-    ()
-end
-@deps histogram2d bins2d
-
-
-@recipe function f{T, E}(h::StatsBase.Histogram{T, 2, E})
-    seriestype --> :bins2d
-    (h.edges[1], h.edges[2], Surface(h.weights))
-end
+@deps histogram2d heatmap


 # ---------------------------------------------------------------------------
@@ -703,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)
@@ -761,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)
@@ -798,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)
@@ -870,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)
@@ -911,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),
@@ -927,9 +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
-    end
    n,m = size(mat)
    Plots.SliceIt, 1:m, 1:n, Surface(mat)
 end
@@ -938,8 +758,8 @@ end
    yflip := true
    aspect_ratio := 1
    rs, cs, zs = findnz(z.surf)
-    xlim := ignorenan_extrema(cs)
-    ylim := ignorenan_extrema(rs)
+    xlim := extrema(cs)
+    ylim := extrema(rs)
    if d[:markershape] == :none
        markershape := :circle
    end
@@ -953,7 +773,6 @@ end
    y := rs
    z := nothing
    seriestype := :scatter
-    grid --> false
    ()
 end

@@ -961,7 +780,7 @@ end

 "Adds a+bx... straight line over the current plot"
 function abline!(plt::Plot, a, b; kw...)
-    plot!(plt, [ignorenan_extrema(plt)...], x -> b + a*x; kw...)
+    plot!(plt, [extrema(plt)...], x -> b + a*x; kw...)
 end

 abline!(args...; kw...) = abline!(current(), args...; kw...)
@@ -970,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{T<:Number}(A::Array{Complex{T}})
-    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{T<:Real,T2}(x::AbstractArray{T},y::Array{Complex{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,7 +6,7 @@
 # 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))

@@ -257,23 +257,12 @@ end
 # # 1 argument
 # # --------------------------------------------------------------------

-# helper function to ensure relevant attributes are wrapped by Surface
-function wrap_surfaces(d::KW)
-    if haskey(d, :fill_z)
-        v = d[:fill_z]
-        if !isa(v, Surface)
-            d[:fill_z] = Surface(v)
-        end
-    end
-end
-
@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{T<:Union{Integer,AbstractFloat}}(mat::AMat{T})
    if all3D(d)
        n,m = size(mat)
-        wrap_surfaces(d)
        SliceIt, 1:m, 1:n, Surface(mat)
    else
        SliceIt, nothing, mat, nothing
@@ -285,7 +274,6 @@ end
    if all3D(d)
        mat = fmt.data
        n,m = size(mat)
-        wrap_surfaces(d)
        SliceIt, 1:m, 1:n, Formatted(Surface(mat), fmt.formatter)
    else
        SliceIt, nothing, fmt, nothing
@@ -317,10 +305,9 @@ end
 # # images - colors

@recipe function f{T<:Colorant}(mat::AMat{T})
-	n, m = size(mat)
-
    if is_seriestype_supported(:image)
        seriestype := :image
+        n, m = size(mat)
        SliceIt, 1:m, 1:n, Surface(mat)
    else
        seriestype := :heatmap
@@ -404,7 +391,6 @@ end
    #         seriestype := :path3d
    #     end
    # end
-    wrap_surfaces(d)
    SliceIt, x, y, z
 end

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

@@ -425,7 +410,6 @@ end
    if !like_surface(get(d, :seriestype, :none))
        d[:seriestype] = :contour
    end
-    wrap_surfaces(d)
    SliceIt, x, y, Surface(z)
 end

@@ -32,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
        ))
@@ -2,8 +2,7 @@
 function theme(s::Symbol; kw...)
    # reset?
    if s == :none || s == :default
-        PlotUtils.clibrary(:Plots)
-        PlotUtils.default_cgrad(default = :sequential, sequential = :inferno)
+        PlotUtils._default_gradient[] = :inferno
        default(;
            bg        = :white,
            bglegend  = :match,
@@ -24,8 +23,7 @@ function theme(s::Symbol; kw...)
    # update the default gradient and other defaults
    thm = PlotThemes._themes[s]
    if thm.gradient != nothing
-        PlotUtils.clibrary(:misc)
-        PlotUtils.default_cgrad(default = :sequential, sequential = PlotThemes.gradient_name(s))
+        PlotUtils._default_gradient[] = PlotThemes.gradient_name(s)
    end
    default(;
        bg       = thm.bg_secondary,
@@ -2,12 +2,16 @@
 # 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}

 immutable PlotsDisplay <: Display end

+abstract AbstractBackend
+abstract AbstractPlot{T<:AbstractBackend}
+abstract AbstractLayout
+
 # -----------------------------------------------------------

 immutable InputWrapper{T}
@@ -58,7 +62,7 @@ Extrema() = Extrema(Inf, -Inf)

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

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

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

@@ -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,7 +109,7 @@ 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
@@ -192,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)

@@ -243,19 +243,19 @@ 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{T}(v::T) = T[v]
@@ -283,16 +283,16 @@ unzip{T}(xyuv::FixedSizeArrays.Vec{4,T})       = T[xyuv[1]], T[xyuv[2]], T[xyuv[
 # 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...)
@@ -324,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
@@ -332,44 +332,31 @@ 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
    phi, r = x, y
-    r = (r - rmin) / (rmax - rmin)
+    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(r,i) * cos.(_cycle(phi,i))
-        y[i] = _cycle(r,i) * sin.(_cycle(phi,i))
+        x[i] = cycle(r,i) * cos(cycle(phi,i))
+        y[i] = cycle(r,i) * sin(cycle(phi,i))
    end
    x, y
 end
@@ -482,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
@@ -493,7 +480,7 @@ 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)
 end

@@ -658,7 +645,7 @@ 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))
+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)
@@ -884,9 +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))
+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.12.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,7 +43,11 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is
    fn = "ref$idx.png"

    # firgure out version info
-    versions = sort(VersionNumber.(readdir(refdir)), 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

@@ -94,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,131 +7,89 @@ srand(1234)
 default(show=false, reuse=true)
 img_eps = isinteractive() ? 1e-2 : 10e-2

-@testset "GR" begin
-    @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


 # tests for preprocessing recipes

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

    # user recipe

@@ -168,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)