From 8fbd0b4a98fccdc599eae904df9e51eacb975225 Mon Sep 17 00:00:00 2001
From: Xuan Sang LE <xsang.le@gmail.com>
Date: Wed, 16 Aug 2017 00:27:32 +0200
Subject: [PATCH] use services to communicate between apps

---
 Makefile                                      |  74 +++++++++---------
 src/core/{gui => }/BaseApplication.coffee     |  39 ++++-----
 src/core/{gui => }/BaseEvent.coffee           |   0
 src/core/BaseModel.coffee                     |  50 ++++++++++++
 src/core/{gui => }/BaseService.coffee         |  26 +++---
 src/core/api.coffee                           |  18 ++---
 src/core/core.coffee                          |  69 ++++++++++++++++
 src/core/{gui => }/gui.coffee                 |  28 +++++--
 src/core/gui/tags/afx-service.js              |   3 -
 src/core/gui/themes/antos/afx-sys-panel.css   |  28 -------
 src/core/processes.coffee                     |  36 ---------
 src/core/{gui => }/schemes/dm.html            |   0
 src/core/schemes/notifications.html           |  36 +++++++++
 src/core/{gui => }/tags/afx-app-window.js     |   2 +-
 src/core/{gui => }/tags/afx-apps-dock.js      |   0
 src/core/{gui => }/tags/afx-button.js         |   0
 src/core/tags/afx-dummy.js                    |   3 +
 src/core/tags/afx-feed.js                     |  35 +++++++++
 src/core/{gui => }/tags/afx-grid-view.js      |   0
 src/core/{gui => }/tags/afx-hbox.js           |   0
 src/core/{gui => }/tags/afx-list-view.js      |  32 +++++++-
 src/core/{gui => }/tags/afx-menu.js           |  13 +--
 src/core/tags/afx-overlay.js                  |  45 +++++++++++
 src/core/{gui => }/tags/afx-sys-panel.js      |  24 ++++--
 src/core/{gui => }/tags/afx-tree-view.js      |   0
 src/core/{gui => }/tags/afx-vbox.js           |   0
 src/define.coffee                             |  23 ------
 src/packages/ActivityMonitor/main.coffee      |   2 +-
 src/packages/DummyApp/main.coffee             |   4 +-
 src/services/Calendar.coffee                  |   4 +-
 src/services/PushNotification.coffee          |  72 +++++++++++++++--
 src/services/Spotlight.coffee                 |  15 +++-
 .../gui => }/themes/antos/afx-app-window.css  |   0
 .../gui => }/themes/antos/afx-button.css      |   0
 src/{core/gui => }/themes/antos/afx-dock.css  |   0
 src/themes/antos/afx-feed.css                 |  44 +++++++++++
 .../gui => }/themes/antos/afx-grid-view.css   |   0
 .../gui => }/themes/antos/afx-list-view.css   |  17 ++++
 src/{core/gui => }/themes/antos/afx-menu.css  |   0
 src/themes/antos/afx-sys-panel.css            |  59 ++++++++++++++
 .../gui => }/themes/antos/afx-tree-view.css   |   0
 src/{core/gui => }/themes/antos/antos.css     |   0
 .../gui => }/themes/antos/font-awesome.css    |   0
 .../themes/antos/fonts/FontAwesome.otf        | Bin
 .../antos/fonts/fontawesome-webfont.eot       | Bin
 .../antos/fonts/fontawesome-webfont.svg       |   0
 .../antos/fonts/fontawesome-webfont.ttf       | Bin
 .../antos/fonts/fontawesome-webfont.woff      | Bin
 .../antos/fonts/fontawesome-webfont.woff2     | Bin
 .../antos/fonts/hermit-light-webfont.woff     | Bin
 .../antos/fonts/hermit-light-webfont.woff2    | Bin
 .../antos/fonts/ubuntu-bold-webfont.woff      | Bin
 .../antos/fonts/ubuntu-bold-webfont.woff2     | Bin
 .../fonts/ubuntu-bolditalic-webfont.woff      | Bin
 .../fonts/ubuntu-bolditalic-webfont.woff2     | Bin
 .../antos/fonts/ubuntu-italic-webfont.woff    | Bin
 .../antos/fonts/ubuntu-italic-webfont.woff2   | Bin
 .../antos/fonts/ubuntu-regular-webfont.woff   | Bin
 .../antos/fonts/ubuntu-regular-webfont.woff2  | Bin
 .../gui => }/themes/antos/hermit-light.css    |   0
 .../gui => }/themes/antos/ubuntu-regular.css  |   0
 src/{core/gui => }/themes/antos/wallpaper.jpg | Bin
 62 files changed, 590 insertions(+), 211 deletions(-)
 rename src/core/{gui => }/BaseApplication.coffee (73%)
 rename src/core/{gui => }/BaseEvent.coffee (100%)
 create mode 100644 src/core/BaseModel.coffee
 rename src/core/{gui => }/BaseService.coffee (70%)
 create mode 100644 src/core/core.coffee
 rename src/core/{gui => }/gui.coffee (81%)
 delete mode 100644 src/core/gui/tags/afx-service.js
 delete mode 100644 src/core/gui/themes/antos/afx-sys-panel.css
 delete mode 100644 src/core/processes.coffee
 rename src/core/{gui => }/schemes/dm.html (100%)
 create mode 100644 src/core/schemes/notifications.html
 rename src/core/{gui => }/tags/afx-app-window.js (99%)
 rename src/core/{gui => }/tags/afx-apps-dock.js (100%)
 rename src/core/{gui => }/tags/afx-button.js (100%)
 create mode 100644 src/core/tags/afx-dummy.js
 create mode 100644 src/core/tags/afx-feed.js
 rename src/core/{gui => }/tags/afx-grid-view.js (100%)
 rename src/core/{gui => }/tags/afx-hbox.js (100%)
 rename src/core/{gui => }/tags/afx-list-view.js (79%)
 rename src/core/{gui => }/tags/afx-menu.js (86%)
 create mode 100644 src/core/tags/afx-overlay.js
 rename src/core/{gui => }/tags/afx-sys-panel.js (80%)
 rename src/core/{gui => }/tags/afx-tree-view.js (100%)
 rename src/core/{gui => }/tags/afx-vbox.js (100%)
 delete mode 100644 src/define.coffee
 rename src/{core/gui => }/themes/antos/afx-app-window.css (100%)
 rename src/{core/gui => }/themes/antos/afx-button.css (100%)
 rename src/{core/gui => }/themes/antos/afx-dock.css (100%)
 create mode 100644 src/themes/antos/afx-feed.css
 rename src/{core/gui => }/themes/antos/afx-grid-view.css (100%)
 rename src/{core/gui => }/themes/antos/afx-list-view.css (85%)
 rename src/{core/gui => }/themes/antos/afx-menu.css (100%)
 create mode 100644 src/themes/antos/afx-sys-panel.css
 rename src/{core/gui => }/themes/antos/afx-tree-view.css (100%)
 rename src/{core/gui => }/themes/antos/antos.css (100%)
 rename src/{core/gui => }/themes/antos/font-awesome.css (100%)
 rename src/{core/gui => }/themes/antos/fonts/FontAwesome.otf (100%)
 rename src/{core/gui => }/themes/antos/fonts/fontawesome-webfont.eot (100%)
 rename src/{core/gui => }/themes/antos/fonts/fontawesome-webfont.svg (100%)
 rename src/{core/gui => }/themes/antos/fonts/fontawesome-webfont.ttf (100%)
 rename src/{core/gui => }/themes/antos/fonts/fontawesome-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/fontawesome-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/fonts/hermit-light-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/hermit-light-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-bold-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-bold-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-bolditalic-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-bolditalic-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-italic-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-italic-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-regular-webfont.woff (100%)
 rename src/{core/gui => }/themes/antos/fonts/ubuntu-regular-webfont.woff2 (100%)
 rename src/{core/gui => }/themes/antos/hermit-light.css (100%)
 rename src/{core/gui => }/themes/antos/ubuntu-regular.css (100%)
 rename src/{core/gui => }/themes/antos/wallpaper.jpg (100%)

diff --git a/Makefile b/Makefile
index 79cc9e1..4372df6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,53 +4,57 @@ BUILDDIR = build/htdocs
 BLUE=\033[1;34m
 NC=\033[0m
 
-coffees= 	src/define.coffee\
+coffees= 	src/core/core.coffee\
         	src/core/api.coffee\
-			src/core/processes.coffee\
         	src/core/handlers/InBrowserHandler.coffee\
-        	src/core/gui/gui.coffee\
-			src/core/gui/BaseApplication.coffee\
-			src/core/gui/BaseService.coffee\
-			src/core/gui/BaseEvent.coffee\
+        	src/core/gui.coffee\
+			src/core/BaseModel.coffee\
+			src/core/BaseApplication.coffee\
+			src/core/BaseService.coffee\
+			src/core/BaseEvent.coffee\
         	src/antos.coffee
 
-tags=	src/core/gui/tags/afx-button.js\
-        src/core/gui/tags/afx-menu.js\
-        src/core/gui/tags/afx-sys-panel.js\
-        src/core/gui/tags/afx-apps-dock.js\
-        src/core/gui/tags/afx-app-window.js\
-        src/core/gui/tags/afx-vbox.js\
-        src/core/gui/tags/afx-hbox.js\
-        src/core/gui/tags/afx-list-view.js\
-		src/core/gui/tags/afx-tree-view.js \
-		src/core/gui/tags/afx-grid-view.js 
+tags=	src/core/tags/afx-button.js\
+        src/core/tags/afx-menu.js\
+        src/core/tags/afx-sys-panel.js\
+        src/core/tags/afx-apps-dock.js\
+        src/core/tags/afx-app-window.js\
+        src/core/tags/afx-vbox.js\
+        src/core/tags/afx-hbox.js\
+        src/core/tags/afx-list-view.js\
+		src/core/tags/afx-tree-view.js \
+		src/core/tags/afx-overlay.js\
+		src/core/tags/afx-dummy.js\
+		src/core/tags/afx-feed.js\
+		src/core/tags/afx-grid-view.js 
 
-antos_themes = 	src/core/gui/themes/antos/font-awesome.css\
-        		src/core/gui/themes/antos/ubuntu-regular.css\
-        		src/core/gui/themes/antos/hermit-light.css\
-        		src/core/gui/themes/antos/antos.css\
-        		src/core/gui/themes/antos/afx-button.css\
-        		src/core/gui/themes/antos/afx-menu.css\
-        		src/core/gui/themes/antos/afx-sys-panel.css\
-        		src/core/gui/themes/antos/afx-dock.css\
-				src/core/gui/themes/antos/afx-list-view.css\
-				src/core/gui/themes/antos/afx-tree-view.css\
-				src/core/gui/themes/antos/afx-grid-view.css\
-        		src/core/gui/themes/antos/afx-app-window.css 
+antos_themes = 	src/themes/antos/font-awesome.css\
+        		src/themes/antos/ubuntu-regular.css\
+        		src/themes/antos/hermit-light.css\
+        		src/themes/antos/antos.css\
+        		src/themes/antos/afx-button.css\
+        		src/themes/antos/afx-menu.css\
+        		src/themes/antos/afx-sys-panel.css\
+        		src/themes/antos/afx-dock.css\
+				src/themes/antos/afx-list-view.css\
+				src/themes/antos/afx-tree-view.css\
+				src/themes/antos/afx-grid-view.css\
+				src/themes/antos/afx-feed.css\
+        		src/themes/antos/afx-app-window.css 
 
 
 
 packages = NotePad wTerm ActivityMonitor DummyApp
 services = PushNotification Spotlight Calendar
 
-main: clean build_coffee build_tag build_theme schemes libs build_services build_packages
+main: clean build_coffees build_tags build_themes schemes libs build_services build_packages
 	- cp src/index.html $(BUILDDIR)/
 
 lite: build_coffee build_tag build_theme schemes  build_services build_packages
 #%.js: %.coffee
 #		coffee --compile $< 
 
-build_coffee:
+build_coffees:
 	@echo "$(BLUE)=======Building coffee files=======$(NC)"
 	- mkdir $(BUILDDIR)/scripts
 	- rm $(BUILDDIR)/scripts/antos.js
@@ -66,15 +70,15 @@ libs:
 schemes:
 	@echo "$(BLUE)=======Copy schemes files======= $(NC)"
 	- mkdir -p $(BUILDDIR)/resources/schemes
-	cp src/core/gui/schemes/* $(BUILDDIR)/resources/schemes/
+	cp src/core/schemes/* $(BUILDDIR)/resources/schemes/
 	
-build_tag:
+build_tags:
 	@echo "=======$(BLUE)Building tag files=======$(NC)"
 	-mkdir $(BUILDDIR)/resources 
 	-rm $(BUILDDIR)/resources/antos_tags.js
 	for f in $(tags); do (cat "$${f}"; echo) >> $(BUILDDIR)/resources/antos_tags.js; done
 
-build_theme: antos_themes_build
+build_themes: antos_themes_build
 
 
 antos_themes_build:
@@ -83,8 +87,8 @@ antos_themes_build:
 	-mkdir -p $(BUILDDIR)/resources/themes/antos
 	for f in $(antos_themes); do (cat "$${f}"; echo) >> $(BUILDDIR)/resources/themes/antos/antos.css; done
 	-mkdir -p $(BUILDDIR)/resources/themes/antos/fonts
-	cp -rf src/core/gui/themes/antos/fonts/* $(BUILDDIR)/resources/themes/antos/fonts
-	cp src/core/gui/themes/antos/wallpaper.jpg $(BUILDDIR)/resources/themes/antos/
+	cp -rf src/themes/antos/fonts/* $(BUILDDIR)/resources/themes/antos/fonts
+	cp src/themes/antos/wallpaper.jpg $(BUILDDIR)/resources/themes/antos/
 
 
 build_services:
diff --git a/src/core/gui/BaseApplication.coffee b/src/core/BaseApplication.coffee
similarity index 73%
rename from src/core/gui/BaseApplication.coffee
rename to src/core/BaseApplication.coffee
index 2733b0d..b26131a 100644
--- a/src/core/gui/BaseApplication.coffee
+++ b/src/core/BaseApplication.coffee
@@ -1,16 +1,15 @@
 self = this
 _PM = self.OS.PM
 _APP = self.OS.APP
-class BaseApplication
-    constructor: (@name) ->
-        @observable = riot.observable()
-        @pid = 0
-        @_api = self.OS.API
+_MAIL = self.OS.courrier
+class BaseApplication extends this.OS.GUI.BaseModel
+    constructor: (name) ->
+        super name
 
     init: ->
         me = @
         # first register some base event to the app
-        @on "exit", () -> me.quit()
+        
         @on "focus", () ->
             me.sysdock.set "selectedApp", me
             me.appmenu.pid = me.pid
@@ -20,41 +19,33 @@ class BaseApplication
         @on "hide", () ->
             me.sysdock.set "selectedApp", null
             me.appmenu.set "items", []
-        @on "menuselect", (item) ->
-            switch item.data.dataid
+        @on "menuselect", (d) ->
+            switch d.e.item.data.dataid
                 when "#{me.name}-about" then alert "About " + me.pid + me.name
                 when  "#{me.name}-exit" then me.trigger "exit"
         #now load the scheme
         path = "packages/#{@name}/scheme.html"
-        _GUI.loadScheme path , @
+        @.render path
 
-    on: (e, f) -> @observable.on e, f
-
-    trigger: (e, d) -> @observable.trigger e, d
-    
     show: () ->
-        @observable.trigger "focus"
+        @trigger "focus"
     
     blur: () ->
         @.appmenu.set "items", [] if @.appmenu and @.pid == @.appmenu.pid
-        @observable.trigger "blur"
+        @trigger "blur"
     
     hide: () ->
-        @observable.trigger "hide"
+        @trigger "hide"
     
     toggle: () ->
-        @observable.trigger "toggle"
+        @trigger "toggle"
     
-    quit: () ->
-        evt = new _GUI.BaseEvent("exit")
-        @exit(evt)
+    onexit: (evt) ->
+        @cleanup(evt)
         if not evt.prevent
             @.appmenu.set "items", [] if @.pid == @.appmenu.pid
-            _PM.kill @
             ($ @scheme).remove()
     
-    find: (id) -> ($ "[data-id='#{id}']", @scheme)[0]
-    
     baseMenu: ->
         menu =
             [{
@@ -81,7 +72,7 @@ class BaseApplication
         # to return app data
     update:->
         #implement by subclasses
-    exit: (e) ->
+    cleanup: (e) ->
         #implement by subclasses
         # to handle the exit event
         # use e.preventDefault() to
diff --git a/src/core/gui/BaseEvent.coffee b/src/core/BaseEvent.coffee
similarity index 100%
rename from src/core/gui/BaseEvent.coffee
rename to src/core/BaseEvent.coffee
diff --git a/src/core/BaseModel.coffee b/src/core/BaseModel.coffee
new file mode 100644
index 0000000..cd3cddd
--- /dev/null
+++ b/src/core/BaseModel.coffee
@@ -0,0 +1,50 @@
+self = this
+_PM = self.OS.PM
+_APP = self.OS.APP
+_MAIL = self.OS.courrier
+_GUI  = self.OS.GUI
+class BaseModel
+    constructor: (@name) ->
+        @observable = riot.observable()
+        @pid = 0
+        @_api = self.OS.API
+        me = @
+        @on "exit", () -> me.quit()
+        @parent = "#desktop"
+
+    render: (p) ->
+        _GUI.loadScheme p, @, @parent
+
+    quit: () ->
+        evt = new _GUI.BaseEvent("exit")
+        @onexit(evt)
+        if not evt.prevent
+            delete @.observable
+            _PM.kill @
+
+    init: ->
+        #implement by sub class
+    onexit: (e) ->
+        #implement by subclass
+    on: (e, f) -> @observable.on e, f
+
+    trigger: (e, d) -> @observable.trigger e, d
+
+    subscribe: (e, f) -> _MAIL.on e, f, @
+    meta: () -> _APP[@name].meta
+    publish: (t, m) ->
+        mt = @meta()
+        _MAIL.trigger t, { id: @pid, name: @name, data: { m: m, icon: mt.icon, iconclass: mt.iconclass } }
+    notify: (m) ->
+        @publish "notification", m
+    warn: (m) ->
+        @publish "warning", m
+    error: (m) ->
+        @publish "error", m
+    fail: (m) ->
+        @publish "fail", m
+
+    
+    find: (id) -> ($ "[data-id='#{id}']", @scheme)[0] if @scheme
+    
+this.OS.GUI.BaseModel = BaseModel
\ No newline at end of file
diff --git a/src/core/gui/BaseService.coffee b/src/core/BaseService.coffee
similarity index 70%
rename from src/core/gui/BaseService.coffee
rename to src/core/BaseService.coffee
index 4942208..f201bea 100644
--- a/src/core/gui/BaseService.coffee
+++ b/src/core/BaseService.coffee
@@ -1,12 +1,11 @@
 MAIL = this.OS.courrier
 _API = this.OS.API
-_PM = this.OS.PM
-class BaseService
-    constructor: (@name) ->
+class BaseService extends this.OS.GUI.BaseModel
+    constructor: (name) ->
+        super name
         @icon = undefined
         @iconclass = "fa-paper-plane-o"
         @text = ""
-        @_api = _API
         @timer = undefined
         @holder = undefined
 
@@ -15,26 +14,29 @@ class BaseService
         # event registe, etc
         # scheme loader
 
-    attach: (h) -> @holder = h
+    attach: (h) ->
+        @holder = h
+
     update: () -> @holder.update() if @holder
-    on: (e, f) -> MAIL.on e, f
-    trigger: (e, d) -> MAIL.trigger e, d
+    
     watch: ( t, f) ->
         me = @
         func = () ->
             f()
             me.timer = setTimeout (() -> func()), t
         func()
-    quit: ()->
+    onexit: (evt) ->
         console.log "clean timer" if @timer
         clearTimeout @timer if @timer
-        @cleanup()
-        _PM.kill @
+        @cleanup(evt)
+        ($ @scheme).remove() if @scheme
+        
     main: () ->
     show: () ->
-    awake: () ->
+    awake: (e) ->
         #implement by user to tart the service
-    cleanup:() ->
+    cleanup: (evt) ->
         #implemeted by user
 BaseService.type = 2
+BaseService.singleton = true
 this.OS.GUI.BaseService = BaseService
\ No newline at end of file
diff --git a/src/core/api.coffee b/src/core/api.coffee
index 840a682..339ddf4 100644
--- a/src/core/api.coffee
+++ b/src/core/api.coffee
@@ -5,21 +5,19 @@ self.OS.API =
     handler: new Object()
 
     #request a user data
-    request: (query,callback) ->
+    request: (query, callback) ->
         # definition here
-        handle.request query,callback
+        handle.request query, callback
 
     systemConfig: ->
         _API.request 'config', (result) ->
             console.log  result
     
-    get:(p,c,f)->
-        $.get p 
-        .done (data) -> 
-            c(data) 
-        .fail ->
-            f()
-    resource: (resource,callback) ->
+    get: (p, c, f) ->
+        $.get p
+            .done (data) -> c(data)
+            .fail -> f()
+    resource: (resource, callback) ->
         path = "resources/#{resource}"
-        _API.get path,callback
+        _API.get path, callback
         
diff --git a/src/core/core.coffee b/src/core/core.coffee
new file mode 100644
index 0000000..106f0d3
--- /dev/null
+++ b/src/core/core.coffee
@@ -0,0 +1,69 @@
+#define the OS object
+self = this
+self.OS or=
+
+    API: new Object()
+    GUI: new Object()
+    APP: new Object()
+
+    courrier:
+        observable: riot.observable()
+        listeners: new Object
+        on: (e, f, a) ->
+            _courrier.listeners[a.pid] = [] unless _courrier.listeners[a.pid]
+            _courrier.listeners[a.pid].push { e: e, f: f }
+            _courrier.observable.on e, f
+        trigger: (e, d) -> _courrier.observable.trigger e, d
+        unregister: (app) ->
+            return unless _courrier.listeners[app.pid] and _courrier.listeners[app.pid].length > 0
+            _courrier.observable.off i.e, i.f for i in _courrier.listeners[app.pid]
+            delete _courrier.listeners[app.pid]
+            _courrier.listeners[app.pid] = []
+    register: (name, x) -> _APP[name] = x
+    
+    PM:
+        pidalloc: 0
+        processes: new Object
+        createProcess: (app, cls) ->
+            #if it is single ton
+            # and a process is existing
+            # just return it
+            if cls.singleton and _PM.processes[app] and _PM.processes[app].length == 1
+                _PM.processes[app][0].show()
+            else
+                _PM.processes[app] = [] if not _PM.processes[app]
+                obj = new cls
+                obj.birth = (new Date).getTime()
+                _PM.pidalloc++
+                obj.pid = _PM.pidalloc
+                _PM.processes[app].push obj
+                if cls.type is 1 then _GUI.dock obj, cls.meta else _GUI.attachservice obj
+            if cls.type is 2
+                _courrier.trigger "srvroutineready", app
+        appByPid: (pid) ->
+            app = undefined
+            find = (l) ->
+                return a for a in l when a.pid is pid
+            for k, v of _PM.processes
+                app = find v
+                break if app
+            app
+            
+        kill: (app) ->
+            return if not _PM.processes[app.name]
+
+            i = _PM.processes[app.name].indexOf app
+            if i >= 0
+                if _APP[app.name].type == 1 then _GUI.undock app else _GUI.detachservice app
+                _courrier.unregister app
+                delete _PM.processes[app.name][i]
+                _PM.processes[app.name].splice i, 1
+
+    boot: ->
+        #first load the configuration
+        #then load the theme
+        _GUI = self.OS.GUI
+        _GUI.loadTheme "antos"
+        _GUI.initDM()
+        _courrier.observable.one "syspanelloaded", () ->
+             _GUI.pushServices ["PushNotification", "Spotlight", "Calendar"]
\ No newline at end of file
diff --git a/src/core/gui/gui.coffee b/src/core/gui.coffee
similarity index 81%
rename from src/core/gui/gui.coffee
rename to src/core/gui.coffee
index a928d63..6507a80 100644
--- a/src/core/gui/gui.coffee
+++ b/src/core/gui.coffee
@@ -5,17 +5,22 @@ self.OS.GUI =
             data: "#{_GUI.tagPath}/tags.json"
         self.OS.API.request query, ()->
             
-    loadScheme: (path, app) ->
+    loadScheme: (path, app, parent) ->
         _API.get path,
         (x) ->
             return null unless x
             scheme =  $.parseHTML x
-            ($ "#desktop").append scheme
+            ($ parent).append scheme
             riot.mount ($ scheme), { observable: app.observable }
             app.scheme = scheme[0]
             app.main()
             app.show()
         , (f) ->
+            _courrier.trigger "fail",
+                    {id: 0, data: {
+                        m: "Cannot load scheme file: #{path} for #{app.name} (#{app.pid})",e: e, s: s },
+                    name:"OS"
+                    }
             alert "cannot load scheme"
 
     loadTheme: (name) ->
@@ -23,6 +28,13 @@ self.OS.GUI =
         $ "head link#ostheme"
             .attr "href", path
 
+    pushServices: (srvs) ->
+        f = (v) ->
+            _courrier.observable.one "srvroutineready", () -> _GUI.pushService v
+        _GUI.pushService srvs[0]
+        srvs.splice 0, 1
+        f i for i in srvs
+
     pushService: (srv) ->
         return _PM.createProcess srv, _APP[srv] if _APP[srv]
         path = "services/#{srv}.js"
@@ -30,9 +42,10 @@ self.OS.GUI =
             .done (e, s) ->
                 _PM.createProcess srv, _APP[srv]
             .fail (e, s) ->
+                _courrier.trigger "srvroutineready", srv
                 _courrier.trigger "fail",
-                    { m: "Cannot read service script: #{srv} ",
-                    e: e, s: s }
+                    { id:0,data:{m: "Cannot read service script: #{srv} ", e: e, s: s },
+                    name:"0S"}
     
     launch: (app) ->
         if not _APP[app]
@@ -54,14 +67,13 @@ self.OS.GUI =
                                 console.log "Fist time loading " + app
                             , (e, s) ->
                                 _courrier.trigger "fail",
-                                    { m: "Cannot read application metadata: #{app} ",
-                                    e: e, s: s }
+                                    {id:0, data:{ m: "Cannot read application metadata: #{app} ",e: e, s: s }, name:"OS"}
                                 alert "cannot read application, meta-data"
                 .fail (e,s) ->
                     #BUG report here
                     _courrier.trigger "fail",
-                        { m: "Cannot load application script: #{app}", 
-                        e: e, s:s } 
+                        {id :0, data:{m: "Cannot load application script: #{app}", 
+                        e: e, s:s }, name:"OS"}
                     console.log "bug report", e, s, path
         else
             # now launch it
diff --git a/src/core/gui/tags/afx-service.js b/src/core/gui/tags/afx-service.js
deleted file mode 100644
index 38cd043..0000000
--- a/src/core/gui/tags/afx-service.js
+++ /dev/null
@@ -1,3 +0,0 @@
-<afx-service>
-    <yield/>
-</afx-service>
\ No newline at end of file
diff --git a/src/core/gui/themes/antos/afx-sys-panel.css b/src/core/gui/themes/antos/afx-sys-panel.css
deleted file mode 100644
index aa4f44e..0000000
--- a/src/core/gui/themes/antos/afx-sys-panel.css
+++ /dev/null
@@ -1,28 +0,0 @@
-
-afx-sys-panel{
-    padding:0;
-    margin: 0;
-}
-afx-sys-panel div{
-     width: 100%;
-     height: 23px;
-     margin:0;
-     padding: 0;
-     background-color: #e7e7e7;
-     border-bottom: 1px solid #9c9C9C;
-     box-shadow: 1px 1px 1px #9F9F9F;
-     position:absolute;
- }
-afx-sys-panel .afx-panel-os-menu{
-    padding:0;
-    margin: 0;
-    float:left;
-}
-afx-sys-panel .afx-panel-os-stray{
-    float:right;
-}
-
-afx-sys-panel .afx-panel-os-stray  afx-menu afx-menu{
-    top:-4px;
-    right:0;
-}
\ No newline at end of file
diff --git a/src/core/processes.coffee b/src/core/processes.coffee
deleted file mode 100644
index 78c63e2..0000000
--- a/src/core/processes.coffee
+++ /dev/null
@@ -1,36 +0,0 @@
-self.OS.PM =
-    pidalloc: 0
-    processes: new Object
-    createProcess: (app, cls) ->
-        #if it is single ton
-        # and a process is existing
-        # just return it
-        if cls.singleton and _PM.processes[app] and _PM.processes[app].length == 1
-            _PM.processes[app][0].show()
-            return _PM.processes[app][0]
-        else
-            _PM.processes[app] = [] if not _PM.processes[app]
-            obj = new cls
-            obj.birth = (new Date).getTime()
-            _PM.pidalloc++
-            obj.pid = _PM.pidalloc
-            _PM.processes[app].push obj
-            if cls.type is 1 then _GUI.dock obj, cls.meta else _GUI.attachservice obj
-    appByPid:(pid)->
-        app = undefined
-        find = (l) ->
-            return a for a in l when a.pid is pid
-        for k, v of _PM.processes
-            app = find v
-            break if app
-        app
-        
-    kill: (app) ->
-        return if not _PM.processes[app.name]
-
-        i = _PM.processes[app.name].indexOf app
-        if i >= 0
-            p = _PM.processes[app.name][i]
-            if _APP[app.name].type == 1 then _GUI.undock p else _GUI.detachservice p
-            delete _PM.processes[app.name][i]
-            _PM.processes[app.name].splice i, 1
diff --git a/src/core/gui/schemes/dm.html b/src/core/schemes/dm.html
similarity index 100%
rename from src/core/gui/schemes/dm.html
rename to src/core/schemes/dm.html
diff --git a/src/core/schemes/notifications.html b/src/core/schemes/notifications.html
new file mode 100644
index 0000000..336806a
--- /dev/null
+++ b/src/core/schemes/notifications.html
@@ -0,0 +1,36 @@
+<afx-dummy>
+    <afx-overlay data-id = "notifyzone" width = "250">
+        <afx-list-view data-id="notifylist"></afx-list-view>
+        <style>
+            afx-overlay[data-id = "notifyzone"]{
+                background-color: rgba(215,215,215,0.7);
+                
+                overflow-y: auto;
+                overflow-x: hidden;
+                padding:3px;
+                margin: 0;
+            }
+            afx-list-view[data-id = "notifylist"]
+            {
+                padding:0;
+            }
+            afx-list-view[data-id = "notifylist"] li{
+                border:1px solid #a6a6a6;
+                border-radius: 6px;
+                margin-bottom: 2px;
+            }
+        </style>
+    </afx-overlay>
+    <afx-feed data-id = "notifeed"  style = "display: none;"  closable="true">
+        <!--afx-button text = "click me"></afx-button-->
+        <style>
+            afx-feed[data-id = "notifeed"]{
+                position: absolute;
+                width: 250px;
+            }
+            afx-feed[data-id = "notifeed"] > div{
+                box-shadow: 1px 1px 1px #9f9F9F;
+            }
+        </style>
+    </afx-feed>
+</afx-dummy>
\ No newline at end of file
diff --git a/src/core/gui/tags/afx-app-window.js b/src/core/tags/afx-app-window.js
similarity index 99%
rename from src/core/gui/tags/afx-app-window.js
rename to src/core/tags/afx-app-window.js
index 0cc5c65..6587a79 100644
--- a/src/core/gui/tags/afx-app-window.js
+++ b/src/core/tags/afx-app-window.js
@@ -104,7 +104,7 @@
                 else 
                     self.root.observable.trigger("focus")
             })
-            self.root.observable.trigger("loaded", self.root)
+            self.root.observable.trigger("rendered", self.root)
         })
         var enable_dragging = function()
         {
diff --git a/src/core/gui/tags/afx-apps-dock.js b/src/core/tags/afx-apps-dock.js
similarity index 100%
rename from src/core/gui/tags/afx-apps-dock.js
rename to src/core/tags/afx-apps-dock.js
diff --git a/src/core/gui/tags/afx-button.js b/src/core/tags/afx-button.js
similarity index 100%
rename from src/core/gui/tags/afx-button.js
rename to src/core/tags/afx-button.js
diff --git a/src/core/tags/afx-dummy.js b/src/core/tags/afx-dummy.js
new file mode 100644
index 0000000..b697ced
--- /dev/null
+++ b/src/core/tags/afx-dummy.js
@@ -0,0 +1,3 @@
+<afx-dummy>
+    <yield/>
+</afx-dummy>
\ No newline at end of file
diff --git a/src/core/tags/afx-feed.js b/src/core/tags/afx-feed.js
new file mode 100644
index 0000000..61337e9
--- /dev/null
+++ b/src/core/tags/afx-feed.js
@@ -0,0 +1,35 @@
+<afx-feed>
+    <div>
+        <p>
+            <i if={iconclass} class = {iconclass} ></i>
+            <i if={icon} class="icon-style" style = { "background: url("+icon+");background-size: 100% 100%;background-repeat: no-repeat;" }></i>
+            {header}
+            <i if={closable} class = "closable"></i>
+        </p>
+        <div>
+            <p>{text}</p> 
+            <yield/>
+        </div>
+    </div>
+    <script>
+        var self = this
+        this.icon = opts.icon
+        this.iconclass = opts.iconclass
+        this.closable = opts.closable
+        this.header = opts.header||""
+        this.text = opts.text || ""
+        self.root.set = function(k,v)
+        {
+            if(k == "*")
+                for(var i in v)
+                    self[i] = v[i]
+            else
+                self[k] = v
+            self.update()
+        }
+        self.root.get = function(k)
+        {
+            return self[k]
+        }
+    </script>
+</afx-feed>
\ No newline at end of file
diff --git a/src/core/gui/tags/afx-grid-view.js b/src/core/tags/afx-grid-view.js
similarity index 100%
rename from src/core/gui/tags/afx-grid-view.js
rename to src/core/tags/afx-grid-view.js
diff --git a/src/core/gui/tags/afx-hbox.js b/src/core/tags/afx-hbox.js
similarity index 100%
rename from src/core/gui/tags/afx-hbox.js
rename to src/core/tags/afx-hbox.js
diff --git a/src/core/gui/tags/afx-list-view.js b/src/core/tags/afx-list-view.js
similarity index 79%
rename from src/core/gui/tags/afx-list-view.js
rename to src/core/tags/afx-list-view.js
index 6f40411..053fd78 100644
--- a/src/core/gui/tags/afx-list-view.js
+++ b/src/core/tags/afx-list-view.js
@@ -8,11 +8,12 @@
             <i if={iconclass} class = {iconclass} ></i>
             <i if={icon} class="icon-style" style = { "background: url("+icon+");background-size: 100% 100%;background-repeat: no-repeat;" }></i>
             { text }
+            <i if = {closable} class = "closable" click = {parent._remove}></i>
         </li>
     </ul>
     </div>
     <script>
-        this.items = opts.child
+        this.items = opts.child || []
         var self = this
         self.selidx = -1
         self.selectedText = ""
@@ -34,7 +35,16 @@
                 return self.items[self.selidx]
             return self[k]
         }
-        
+        self.root.push = function(e,u)
+        {
+            self.items.push(e)
+            if(u) self.update()
+        }
+        self.root.unshift = function(e,u)
+        {
+            self.items.unshift(e)
+            if(u) self.update()
+        }
         if(opts.observable)
             this.root.observable = opts.observable
         else
@@ -72,6 +82,17 @@
                 $(self.refs.mlist).css("top","100%")
             $(self.refs.mlist).show()
         }
+        _remove(event)
+        {
+            if(self.selidx != -1)
+            {
+                self.items[self.selidx].selected =false
+                self.selidx = -1
+            }
+            self.items.splice(self.items.indexOf(event.item),1)
+            event.target = self.root
+            self.update()
+        }
         _select(event)
         {
             var data = {
@@ -81,7 +102,10 @@
             if(self.selidx != -1)
                 self.items[self.selidx].selected =false
             self.selidx = data.idx
-            self.items[self.selidx].selected = true
+            if(!self.items[self.selidx])
+                return
+            
+            self.items[self.selidx].selected = true    
             if(opts.dropdown  == "true")
             {
                 $(self.refs.mlist).hide()
@@ -90,7 +114,7 @@
             if(self.onlistselect)
                 self.onlistselect(data)
             this.root.observable.trigger('listselect',data)
-            event.preventDefault()
+            //event.preventDefault()
         }
     </script>
 </afx-list-view>
\ No newline at end of file
diff --git a/src/core/gui/tags/afx-menu.js b/src/core/tags/afx-menu.js
similarity index 86%
rename from src/core/gui/tags/afx-menu.js
rename to src/core/tags/afx-menu.js
index 2f98561..fe33136 100644
--- a/src/core/gui/tags/afx-menu.js
+++ b/src/core/tags/afx-menu.js
@@ -1,14 +1,14 @@
 <afx-menu >
     <ul class={context: opts.context == "true"}>
         <li class="afx-corner-fix"></li>
-        <li ref = "container" each={ item,i in items } class = {afx_submenu:item.child != null, fix_padding:item.icon} no-reorder>
+        <li ref = "container" each={ data,i in items } class = {afx_submenu:data.child != null, fix_padding:data.icon} no-reorder>
             <a href="#" onclick = {parent.onselect}>
-                <i if={item.iconclass} class = {item.iconclass} ></i>
-                <i if={item.icon} class="icon-style" style = { "background: url("+item.icon+");background-size: 100% 100%;background-repeat: no-repeat;" }></i>
-                { item.text }
+                <i if={data.iconclass} class = {data.iconclass} ></i>
+                <i if={data.icon} class="icon-style" style = { "background: url("+data.icon+");background-size: 100% 100%;background-repeat: no-repeat;" }></i>
+                { data.text }
             </a>
             
-            <afx-menu  if={item.child != null} child={item.child}  observable = {parent.root.observable} rootid = {parent.rid}></afx-menu>
+            <afx-menu  if={data.child != null} child={data.child} onmenuselect = {data.onmenuselect}  observable = {parent.root.observable} rootid = {parent.rid}></afx-menu>
         </li>
          <li class="afx-corner-fix"></li>
     </ul>
@@ -126,8 +126,9 @@
 
         onselect(event)
         {
-            var data = {id:self.rid, data:event.item.item, root:isRoot}
+            var data = {id:self.rid, root:isRoot, e:event}
             this.root.observable.trigger('menuselect',data)
+            if( this.onmenuselect && !isRoot)  this.onmenuselect(data)
             event.preventDefault()
             $(document).unbind("click",mnhide)
             if(opts.context == "true") return
diff --git a/src/core/tags/afx-overlay.js b/src/core/tags/afx-overlay.js
new file mode 100644
index 0000000..a91a34a
--- /dev/null
+++ b/src/core/tags/afx-overlay.js
@@ -0,0 +1,45 @@
+<afx-overlay>
+    <yield/>
+    <script>
+        this.width = opts.width || 200
+        this.height = opts.height || 400
+        var self = this;
+        self.commander = null
+        this.root.observable = opts.observable || riot.observable()
+        var id = $(self.root).attr("data-id")
+        var calibre_size = function()
+        {
+            $(self.root)
+                .css("width", self.width + "px")
+                .css("height", self.height + "px")
+            self.root.observable.trigger("resize", {id:id,w:self.width,h:self.height})
+        }
+
+        self.root.set = function(k,v)
+        {
+            if(k == "*")
+                for(var i in v)
+                    self[i] = v[i]
+            else
+                self[k] = v
+            if( k == "width" || k == "height")
+                calibre_size()
+            self.update()
+        }
+        self.root.get = function(k)
+        {
+            return self[k]
+        }
+    
+        self.on("mount", function(){
+            $(self.root)
+                .css("position", "absolute")
+                //.css("z-index",1000000)
+            $(self.root).children().each(function(e){
+                this.observalbe = self.root.observalbe
+            })
+            calibre_size()
+            self.root.observable.trigger("rendered", self.root)
+        })
+    </script>
+</afx-overlay>
\ No newline at end of file
diff --git a/src/core/gui/tags/afx-sys-panel.js b/src/core/tags/afx-sys-panel.js
similarity index 80%
rename from src/core/gui/tags/afx-sys-panel.js
rename to src/core/tags/afx-sys-panel.js
index 5ce2a15..e669ca7 100644
--- a/src/core/gui/tags/afx-sys-panel.js
+++ b/src/core/tags/afx-sys-panel.js
@@ -15,23 +15,31 @@
                             {text:"NotePad",type:"app", iconclass:"fa fa-commenting"},
                             {text:"ActivityMonitor",type:"app"},
                             {text:"DummyApp",type:"app"}
-                        ]},
+                        ],
+                        onmenuselect: function(d)
+                        {
+                            if(d.e.item.data.type == "app")
+                                window.OS.GUI.launch(d.e.item.data.text)
+                        }
+                    },
                     {text:"Logout"}
                     ]}
-                ],onmenuselect: function(item)
-                {
-                    if(item.data.type == "app")
-                        window.OS.GUI.launch(item.data.text)
-                }
+                ]
             }
         this.appmenu = { child: [] }
-        this.systray = { child: [], onmenuselect: function(item){item.data.awake()}}
+        this.systray = { 
+            child: [], 
+            onmenuselect: function(d){
+                if(d.root)
+                    d.e.item.data.awake(d.e)
+            }
+        }
 
         var self = this
         self.root.attachservice = function(s)
         {
-            s.attach(self.refs.aTray)
             self.refs.aTray.root.unshift(s,true)
+            s.attach(self.refs.aTray)
         }
         self.root.detachservice = function(s)
         {
diff --git a/src/core/gui/tags/afx-tree-view.js b/src/core/tags/afx-tree-view.js
similarity index 100%
rename from src/core/gui/tags/afx-tree-view.js
rename to src/core/tags/afx-tree-view.js
diff --git a/src/core/gui/tags/afx-vbox.js b/src/core/tags/afx-vbox.js
similarity index 100%
rename from src/core/gui/tags/afx-vbox.js
rename to src/core/tags/afx-vbox.js
diff --git a/src/define.coffee b/src/define.coffee
deleted file mode 100644
index 48dcd2e..0000000
--- a/src/define.coffee
+++ /dev/null
@@ -1,23 +0,0 @@
-#define the OS object
-self = this
-self.OS or=
-    API: new Object()
-    GUI: new Object()
-    APP: new Object()
-    PM: new Object()
-    courrier: riot.observable()
-    register: (name,x)->
-        # load the metadata first
-        _APP[name] = x
-        
-    boot: ->
-        #first load the configuration
-        #then load the theme
-        _GUI = self.OS.GUI
-        _GUI.loadTheme "antos"
-        _GUI.initDM()
-        _courrier.on "syspanelloaded", () ->
-            _GUI.pushService "PushNotification"
-            _GUI.pushService "Spotlight"
-            _GUI.pushService "Calendar"
-        
\ No newline at end of file
diff --git a/src/packages/ActivityMonitor/main.coffee b/src/packages/ActivityMonitor/main.coffee
index 189686a..e653462 100644
--- a/src/packages/ActivityMonitor/main.coffee
+++ b/src/packages/ActivityMonitor/main.coffee
@@ -14,7 +14,7 @@ class ActivityMonitor extends this.OS.GUI.BaseApplication
             app = _PM.appByPid item[0].value
             app.quit() if app
 
-        header = [{width:50,value:"Pid"},{value:"Name"}, {value:"Type", width:75},{width:70,value:"Alive (ms)"}]
+        header = [{width:50,value:"Pid"},{value:"Name"}, {value:"Type", width:80},{width:75,value:"Alive (ms)"}]
         @gdata = 
             processes:{}
             alive:[]
diff --git a/src/packages/DummyApp/main.coffee b/src/packages/DummyApp/main.coffee
index 923f865..a7fac90 100644
--- a/src/packages/DummyApp/main.coffee
+++ b/src/packages/DummyApp/main.coffee
@@ -1,10 +1,12 @@
+_GUI = this.OS.GUI
 class DummyApp extends this.OS.GUI.BaseApplication
     constructor: () ->
         super "DummyApp"
     main: () ->
         self = @
         @on "btclick", (e)->
-            alert "#{self.name}: Happy pola"
+            self.notify "this is a dummy notify"
+            _GUI.pushService "Budgy"
         @on "resize", (w,h)->
             console.log "#{self.name}: resize"
         #@on "listselect", (i)->
diff --git a/src/services/Calendar.coffee b/src/services/Calendar.coffee
index e342a98..af17866 100644
--- a/src/services/Calendar.coffee
+++ b/src/services/Calendar.coffee
@@ -13,10 +13,10 @@ class Calendar extends this.OS.GUI.BaseService
                     "#{now.getHours()}:#{now.getMinutes()}:#{now.getSeconds()}"
             me.update()
        
-    awake: ->
+    awake: (e) ->
         console.log @name,@pid
         # do nothing
-    cleanup: ->
+    cleanup: (evt) ->
         console.log "cleanup for quit"
         # do nothing
 
diff --git a/src/services/PushNotification.coffee b/src/services/PushNotification.coffee
index 80ba8bf..1e5ebf7 100644
--- a/src/services/PushNotification.coffee
+++ b/src/services/PushNotification.coffee
@@ -2,12 +2,74 @@ class PushNotification extends this.OS.GUI.BaseService
     constructor: () ->
         super "PushNotification"
         @iconclass = "fa fa-commenting"
-
+        @onmenuselect = (e) -> console.log e
+        @cb = undefined
+        
     init: ->
-        # do nothing
-    awake: ->
-        console.log @name,@pid
-    cleanup: ->
+        @view = false
+        path = "resources/schemes/notifications.html"
+        @render path
+
+    main: ->
+        me = @
+        mfeed = @find "notifeed"
+        @scheme = @find "notifyzone"
+        mlist = @find "notifylist"
+        @subscribe "notification", (o) ->
+            d = {
+                header: "#{o.name} (#{o.id})"
+                text: "INFO: #{o.name} (#{o.id}): #{o.data.m}",
+                lite: o.data.m
+                icon: o.data.icon,
+                iconclass: o.data.iconclass,
+                closable: true }
+            mlist.push d, true
+            me.notifeed d, mfeed
+        
+        @subscribe "fail", (o) ->
+            d = {
+                header: "#{o.name} (#{o.id})"
+                text: "FAIL: #{o.name} (#{o.id}): #{o.data.m}",
+                lite: o.data.m
+                icon: o.data.icon,
+                iconclass: o.data.iconclass,
+                closable: true }
+            mlist.push d, true
+            me.notifeed d, mfeed
+
+        ($ @scheme).css "right", 0
+            .css "top", "-3px"
+            .css "height", ""
+            .css "bottom", "0"
+            .hide()
+        ($ mfeed).css "right", "5px"
+            .css "top", "0"
+
+    notifeed: (d, mfeed) ->
+        mfeed.set "*", d
+        ($ mfeed).show()
+        timer = setTimeout () ->
+             ($ mfeed).hide()
+             clearTimeout timer
+        , 3000
+
+    awake: (e) ->
+        if  @view then ($ @scheme).hide() else ($ @scheme).show()
+        @view = not @view
+        me = @
+        if not @cb
+            @cb = (e) ->
+                return if e.originalEvent.item and e.originalEvent.item.closable
+                if not ($ e.target).closest($ me.scheme).length and not ($ e.target).closest($ me.holder.root).length
+                    ($ me.scheme).hide()
+                    $(document).unbind "click", me.cb
+                    me.view = not me.view
+        if @view
+            $(document).on "click", @cb
+        else
+            $(document).unbind "click", @cb
+        
+    cleanup: (evt) ->
         # do nothing
 
 this.OS.register "PushNotification",PushNotification
\ No newline at end of file
diff --git a/src/services/Spotlight.coffee b/src/services/Spotlight.coffee
index d57cf45..79d736c 100644
--- a/src/services/Spotlight.coffee
+++ b/src/services/Spotlight.coffee
@@ -2,12 +2,19 @@ class Spotlight extends this.OS.GUI.BaseService
     constructor: () ->
         super "Spotlight"
         @iconclass = "fa fa-search"
-
     init: ->
+        @child = [
+            {
+                text: "#{@.name} (#{@.pid}): dummy notif",
+                child: [ { text: "submenu" } ]
+            }
+        ]
         # do nothing
-    awake: ->
-        console.log @name,@pid
-    cleanup: ->
+    main: ->
+
+    awake: (e) ->
+        console.log @name ,@pid
+    cleanup: (evt) ->
         # do nothing
 
 this.OS.register "Spotlight",Spotlight
\ No newline at end of file
diff --git a/src/core/gui/themes/antos/afx-app-window.css b/src/themes/antos/afx-app-window.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-app-window.css
rename to src/themes/antos/afx-app-window.css
diff --git a/src/core/gui/themes/antos/afx-button.css b/src/themes/antos/afx-button.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-button.css
rename to src/themes/antos/afx-button.css
diff --git a/src/core/gui/themes/antos/afx-dock.css b/src/themes/antos/afx-dock.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-dock.css
rename to src/themes/antos/afx-dock.css
diff --git a/src/themes/antos/afx-feed.css b/src/themes/antos/afx-feed.css
new file mode 100644
index 0000000..7a28d0e
--- /dev/null
+++ b/src/themes/antos/afx-feed.css
@@ -0,0 +1,44 @@
+afx-feed {
+    width: 100%;
+}
+
+afx-feed > div{
+    border:1px solid #a6a6a6;
+    border-radius: 6px;
+    background-color: #e9e9e9;
+}
+
+afx-feed > div > p{
+    padding:2px;
+    padding-top: 0;
+    padding-left: 5px;
+    margin: 0;
+    font-weight: bold;
+    border-bottom: 1px solid #a6a6a6;
+    position: relative;
+}
+afx-feed i.closable{
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+    cursor: pointer;
+}
+afx-feed  i.closable:before{
+    content: "\f00d"; 
+    font-family: "FontAwesome";
+    font-size: 10px;
+    right:5px;
+    color: #414339;
+    position:absolute;
+    font-style: normal;
+    top:5px;
+}
+afx-feed > div > div{
+    background-color: white;
+    padding:5px;
+    border-radius: 6px;
+}
+afx-feed > div > div > p{
+    padding:0;
+    margin: 0;
+}
\ No newline at end of file
diff --git a/src/core/gui/themes/antos/afx-grid-view.css b/src/themes/antos/afx-grid-view.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-grid-view.css
rename to src/themes/antos/afx-grid-view.css
diff --git a/src/core/gui/themes/antos/afx-list-view.css b/src/themes/antos/afx-list-view.css
similarity index 85%
rename from src/core/gui/themes/antos/afx-list-view.css
rename to src/themes/antos/afx-list-view.css
index 0862b3d..a00d093 100644
--- a/src/core/gui/themes/antos/afx-list-view.css
+++ b/src/themes/antos/afx-list-view.css
@@ -24,6 +24,7 @@ afx-list-view  li{
     padding-bottom: 3px;
     color: #414339;
     background-color: white;
+    position: relative;
 }
 afx-list-view li:nth-child(odd){
     background-color: #f5F5F5;
@@ -34,6 +35,22 @@ afx-list-view  i.icon-style {
     display: inline-block;
     float:left;
 }
+afx-list-view  i.closable{
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+    cursor: pointer;
+}
+afx-list-view  i.closable:before{
+    content: "\f00d"; 
+    font-family: "FontAwesome";
+    font-size: 10px;
+    right:5px;
+    color: #414339;
+    position:absolute;
+    font-style: normal;
+    top:5px;
+}
 
 afx-list-view   li > i {
     margin-right: 3px;
diff --git a/src/core/gui/themes/antos/afx-menu.css b/src/themes/antos/afx-menu.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-menu.css
rename to src/themes/antos/afx-menu.css
diff --git a/src/themes/antos/afx-sys-panel.css b/src/themes/antos/afx-sys-panel.css
new file mode 100644
index 0000000..fb8e617
--- /dev/null
+++ b/src/themes/antos/afx-sys-panel.css
@@ -0,0 +1,59 @@
+
+afx-sys-panel{
+    padding:0;
+    margin: 0;
+}
+afx-sys-panel div{
+     width: 100%;
+     height: 23px;
+     margin:0;
+     padding: 0;
+     background-color: #e7e7e7;
+     border-bottom: 1px solid #9c9C9C;
+     box-shadow: 1px 1px 1px #9F9F9F;
+     position:absolute;
+ }
+afx-sys-panel .afx-panel-os-menu{
+    padding:0;
+    margin: 0;
+    float:left;
+}
+afx-sys-panel .afx-panel-os-stray{
+    float:right;
+    position: relative;
+}
+
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu  {
+    right: 0;
+    left: calc(100% - 170px);
+    position: absolute;
+    
+}
+
+
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu li.afx_submenu a{
+    margin-left: 10px;
+}
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu li.afx_submenu:before {
+    content: "\f054"; 
+    font-family: "FontAwesome";
+    font-size: 10px;
+    color: #414339;
+    position:absolute;
+    text-align: left;
+    left:5px;
+    top:25%;
+ }
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu  afx-menu{
+    left: -100%;
+    right: 100%;
+    top:-4px;
+}
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu ul{
+    border:1px solid #a6a6a6;
+    border-radius: 5px;
+    border-top-right-radius: 0px;
+}
+afx-sys-panel afx-menu.afx-panel-os-stray afx-menu li{
+    min-width: 150px;
+}
\ No newline at end of file
diff --git a/src/core/gui/themes/antos/afx-tree-view.css b/src/themes/antos/afx-tree-view.css
similarity index 100%
rename from src/core/gui/themes/antos/afx-tree-view.css
rename to src/themes/antos/afx-tree-view.css
diff --git a/src/core/gui/themes/antos/antos.css b/src/themes/antos/antos.css
similarity index 100%
rename from src/core/gui/themes/antos/antos.css
rename to src/themes/antos/antos.css
diff --git a/src/core/gui/themes/antos/font-awesome.css b/src/themes/antos/font-awesome.css
similarity index 100%
rename from src/core/gui/themes/antos/font-awesome.css
rename to src/themes/antos/font-awesome.css
diff --git a/src/core/gui/themes/antos/fonts/FontAwesome.otf b/src/themes/antos/fonts/FontAwesome.otf
similarity index 100%
rename from src/core/gui/themes/antos/fonts/FontAwesome.otf
rename to src/themes/antos/fonts/FontAwesome.otf
diff --git a/src/core/gui/themes/antos/fonts/fontawesome-webfont.eot b/src/themes/antos/fonts/fontawesome-webfont.eot
similarity index 100%
rename from src/core/gui/themes/antos/fonts/fontawesome-webfont.eot
rename to src/themes/antos/fonts/fontawesome-webfont.eot
diff --git a/src/core/gui/themes/antos/fonts/fontawesome-webfont.svg b/src/themes/antos/fonts/fontawesome-webfont.svg
similarity index 100%
rename from src/core/gui/themes/antos/fonts/fontawesome-webfont.svg
rename to src/themes/antos/fonts/fontawesome-webfont.svg
diff --git a/src/core/gui/themes/antos/fonts/fontawesome-webfont.ttf b/src/themes/antos/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from src/core/gui/themes/antos/fonts/fontawesome-webfont.ttf
rename to src/themes/antos/fonts/fontawesome-webfont.ttf
diff --git a/src/core/gui/themes/antos/fonts/fontawesome-webfont.woff b/src/themes/antos/fonts/fontawesome-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/fontawesome-webfont.woff
rename to src/themes/antos/fonts/fontawesome-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/fontawesome-webfont.woff2 b/src/themes/antos/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/fontawesome-webfont.woff2
rename to src/themes/antos/fonts/fontawesome-webfont.woff2
diff --git a/src/core/gui/themes/antos/fonts/hermit-light-webfont.woff b/src/themes/antos/fonts/hermit-light-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/hermit-light-webfont.woff
rename to src/themes/antos/fonts/hermit-light-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/hermit-light-webfont.woff2 b/src/themes/antos/fonts/hermit-light-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/hermit-light-webfont.woff2
rename to src/themes/antos/fonts/hermit-light-webfont.woff2
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-bold-webfont.woff b/src/themes/antos/fonts/ubuntu-bold-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-bold-webfont.woff
rename to src/themes/antos/fonts/ubuntu-bold-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-bold-webfont.woff2 b/src/themes/antos/fonts/ubuntu-bold-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-bold-webfont.woff2
rename to src/themes/antos/fonts/ubuntu-bold-webfont.woff2
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-bolditalic-webfont.woff b/src/themes/antos/fonts/ubuntu-bolditalic-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-bolditalic-webfont.woff
rename to src/themes/antos/fonts/ubuntu-bolditalic-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-bolditalic-webfont.woff2 b/src/themes/antos/fonts/ubuntu-bolditalic-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-bolditalic-webfont.woff2
rename to src/themes/antos/fonts/ubuntu-bolditalic-webfont.woff2
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-italic-webfont.woff b/src/themes/antos/fonts/ubuntu-italic-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-italic-webfont.woff
rename to src/themes/antos/fonts/ubuntu-italic-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-italic-webfont.woff2 b/src/themes/antos/fonts/ubuntu-italic-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-italic-webfont.woff2
rename to src/themes/antos/fonts/ubuntu-italic-webfont.woff2
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-regular-webfont.woff b/src/themes/antos/fonts/ubuntu-regular-webfont.woff
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-regular-webfont.woff
rename to src/themes/antos/fonts/ubuntu-regular-webfont.woff
diff --git a/src/core/gui/themes/antos/fonts/ubuntu-regular-webfont.woff2 b/src/themes/antos/fonts/ubuntu-regular-webfont.woff2
similarity index 100%
rename from src/core/gui/themes/antos/fonts/ubuntu-regular-webfont.woff2
rename to src/themes/antos/fonts/ubuntu-regular-webfont.woff2
diff --git a/src/core/gui/themes/antos/hermit-light.css b/src/themes/antos/hermit-light.css
similarity index 100%
rename from src/core/gui/themes/antos/hermit-light.css
rename to src/themes/antos/hermit-light.css
diff --git a/src/core/gui/themes/antos/ubuntu-regular.css b/src/themes/antos/ubuntu-regular.css
similarity index 100%
rename from src/core/gui/themes/antos/ubuntu-regular.css
rename to src/themes/antos/ubuntu-regular.css
diff --git a/src/core/gui/themes/antos/wallpaper.jpg b/src/themes/antos/wallpaper.jpg
similarity index 100%
rename from src/core/gui/themes/antos/wallpaper.jpg
rename to src/themes/antos/wallpaper.jpg