diff --git a/core b/core
index c6096a4..de87caf 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c6096a4221d45cf06f541f9c41a91ae8bfcc589b
+Subproject commit de87caf9fad50386331fc5ce91e366434f2ebf53
diff --git a/drawing/Common.lua b/drawing/Common.lua
index d3ea1ea..b6e1b68 100644
--- a/drawing/Common.lua
+++ b/drawing/Common.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local F = require 'Fundamental'
 local Util = require 'Util'
-local Theme = require 'Patterns'
+local Theme = require 'Theme'
 local Dial = require 'Dial'
 local Rect = require 'Rect'
 local FillRect = require 'FillRect'
diff --git a/main.lua b/main.lua
index c6ff7da..f54dfa6 100644
--- a/main.lua
+++ b/main.lua
@@ -9,14 +9,12 @@ package.path = ABS_PATH..'?.lua;'..
    ABS_PATH..'drawing/?.lua;'..
    ABS_PATH..'schema/?.lua;'..
    ABS_PATH..'core/func/?.lua;'..
-   ABS_PATH..'core/super/?.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/rect/?.lua;'..
-   ABS_PATH..'core/widget/poly/?.lua;'..
-   ABS_PATH..'core/widget/image/?.lua;'
+   ABS_PATH..'core/widget/poly/?.lua;'
 
 local Util 			= require 'Util'
 local System 		= require 'System'
diff --git a/schema/Patterns.lua b/schema/Theme.lua
similarity index 100%
rename from schema/Patterns.lua
rename to schema/Theme.lua