diff --git a/core b/core
index 958f836..8fdf426 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 958f836bebece975a212d756c56f3de17c2ac6ce
+Subproject commit 8fdf42631afd209d076e23e1db1025aafcdcfb62
diff --git a/drawing/common.lua b/drawing/common.lua
index 2dc47dc..c00ccf1 100644
--- a/drawing/common.lua
+++ b/drawing/common.lua
@@ -1,6 +1,6 @@
 local M = {}
 
-local F = require 'primitive'
+local F = require 'geom'
 local util = require 'util'
 local theme = require 'theme'
 local dial = require 'dial'
diff --git a/drawing/memory.lua b/drawing/memory.lua
index c244966..a905df5 100644
--- a/drawing/memory.lua
+++ b/drawing/memory.lua
@@ -3,7 +3,7 @@ local texttable = require 'texttable'
 local util = require 'util'
 local common = require 'common'
 local geometry = require 'geometry'
-local func = require 'func'
+local pure = require 'pure'
 
 return function(update_freq)
    local MODULE_Y = 712
@@ -111,7 +111,7 @@ return function(update_freq)
    -- memory top table
 
    local NUM_ROWS = 5
-   local TABLE_CONKY = func.map(
+   local TABLE_CONKY = pure.map(
       function(i)
          return {
             comm = '${top_mem name '..i..'}',
@@ -119,7 +119,7 @@ return function(update_freq)
             mem = '${top_mem mem '..i..'}',
          }
       end,
-      func.seq(NUM_ROWS))
+      pure.seq(NUM_ROWS))
 
    local tbl = common.make_text_table(
       geometry.RIGHT_X,
diff --git a/drawing/network.lua b/drawing/network.lua
index 40c0903..b1eb815 100644
--- a/drawing/network.lua
+++ b/drawing/network.lua
@@ -1,7 +1,7 @@
 local util = require 'util'
 local common = require 'common'
 local geometry = require 'geometry'
-local func = require 'func'
+local pure = require 'pure'
 
 return function(update_freq)
    local PLOT_SEC_BREAK = 20
@@ -18,7 +18,7 @@ return function(update_freq)
 
    local INTERFACES = get_interfaces()
 
-   local INTERFACE_PATHS = func.map(
+   local INTERFACE_PATHS = pure.map(
       function(s)
          local dir = string.format('/sys/class/net/%s/statistics/', s)
          return {rx = dir..'rx_bytes', tx = dir..'tx_bytes'}
diff --git a/drawing/processor.lua b/drawing/processor.lua
index f563c77..dc1c499 100644
--- a/drawing/processor.lua
+++ b/drawing/processor.lua
@@ -4,8 +4,8 @@ local texttable = require 'texttable'
 local util = require 'util'
 local common = require 'common'
 local geometry = require 'geometry'
-local cpu = require 'cpu'
-local func = require 'func'
+local cpu = require 'sys'
+local pure = require 'pure'
 
 local __math_floor = math.floor
 
@@ -117,9 +117,9 @@ return function(update_freq)
    -- cpu top table
 
    local NUM_ROWS = 5
-   local TABLE_CONKY = func.map(
+   local TABLE_CONKY = pure.map(
       function(i) return {pid = '${top pid '..i..'}', cpu = '${top cpu '..i..'}'} end,
-      func.seq(NUM_ROWS)
+      pure.seq(NUM_ROWS)
    )
 
    local tbl = common.make_text_table(
diff --git a/drawing/readwrite.lua b/drawing/readwrite.lua
index 5683802..d1e64f5 100644
--- a/drawing/readwrite.lua
+++ b/drawing/readwrite.lua
@@ -1,7 +1,7 @@
 local util = require 'util'
 local common = require 'common'
 local geometry = require 'geometry'
-local func = require 'func'
+local pure = require 'pure'
 
 return function(update_freq)
    local PLOT_SEC_BREAK = 20
@@ -19,7 +19,7 @@ return function(update_freq)
    local __string_match = string.match
 
    -- TODO any way to make better lambda functions?
-   local DEVICE_PATHS = func.map(
+   local DEVICE_PATHS = pure.map(
       function(s) return string.format('/sys/block/%s/stat', s) end,
       DEVICES
    )
diff --git a/main.lua b/main.lua
index 6806527..30acb9d 100644
--- a/main.lua
+++ b/main.lua
@@ -8,11 +8,11 @@ local ABS_PATH = debug.getinfo(1).source:match("@?(.*/)")
 package.path = ABS_PATH..'?.lua;'..
    ABS_PATH..'drawing/?.lua;'..
    ABS_PATH..'schema/?.lua;'..
-   ABS_PATH..'core/func/?.lua;'..
+   ABS_PATH..'core/?.lua;'..
    ABS_PATH..'core/widget/?.lua;'..
    ABS_PATH..'core/widget/arc/?.lua;'..
    ABS_PATH..'core/widget/text/?.lua;'..
-   ABS_PATH..'core/widget/plot/?.lua;'..
+   ABS_PATH..'core/widget/timeseries/?.lua;'..
    ABS_PATH..'core/widget/rect/?.lua;'..
    ABS_PATH..'core/widget/poly/?.lua;'