diff --git a/bower.json b/bower.json
index 486166082..88cad2b22 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
     "name": "bem-project-stub",
     "version": "0.0.1",
     "dependencies": {
-        "bem-core": "9e5dc255421304fd652552c948cdf7af35dc8a68",
+        "bem-core": "bem/bem-core#v2.1.0",
         "bem-components": "bem/bem-components#231b03867325a51a33ae6bdd300b12946944a4de",
         "bouwdoos" : "varya/bouwdoos#v1",
         "bem-highlight.js" : "varya/bem-highlight.js"
diff --git a/desktop.blocks/candies/candies.js b/desktop.blocks/candies/candies.js
index 9df658fdc..0b20de3da 100644
--- a/desktop.blocks/candies/candies.js
+++ b/desktop.blocks/candies/candies.js
@@ -1,9 +1,11 @@
 /** @requires BEM */
 /** @requires BEM.DOM */
 
-modules.define('i-bem__dom', function(provide, DOM) {
+modules.define(
+    { block: 'candies' },
+    function(provide) {
 
-DOM.decl('candies', {
+provide({
 
     onSetMod : {
 
@@ -108,6 +110,4 @@ DOM.decl('candies', {
 
 });
 
-provide(DOM);
-
 });
diff --git a/desktop.blocks/fonts/fonts.js b/desktop.blocks/fonts/fonts.js
index 1c84ac200..c7d7ae5c3 100644
--- a/desktop.blocks/fonts/fonts.js
+++ b/desktop.blocks/fonts/fonts.js
@@ -1,7 +1,10 @@
 /** @requires BEM */
 /* http://stackoverflow.com/questions/16253429/saving-a-css-web-font-in-html5-local-storage */
 
-modules.define('fonts', ['jquery'], function(provide, $) {
+modules.define(
+    { block: 'fonts' },
+    ['jquery'],
+    function(provide, $) {
 
 $(function(){
 
diff --git a/desktop.blocks/github/__jquery/github__jquery.js b/desktop.blocks/github/__jquery/github__jquery.js
index a14630d96..3e6f0f7c8 100644
--- a/desktop.blocks/github/__jquery/github__jquery.js
+++ b/desktop.blocks/github/__jquery/github__jquery.js
@@ -2,9 +2,12 @@
 // Source: http://www.joepettersson.com/demo/jquery-github-widget/
 //
 //
-modules.define('i-bem__dom', ['jquery'], function(provide, $, DOM) {
+modules.define(
+    { block: 'github__jquery' },
+    ['jquery'],
+    function(provide, $) {
 
-(function ($, window, document, undefined) {
+provide(function ($, window, document, undefined) {
 	"use strict";
 	// Setup our defaults
 	var pluginName = 'github',
@@ -209,6 +212,4 @@ modules.define('i-bem__dom', ['jquery'], function(provide, $, DOM) {
 
 }($, window, document));
 
-provide(DOM);
-
 });
diff --git a/desktop.blocks/github/github.js b/desktop.blocks/github/github.js
index 30652cdd4..dc4054623 100644
--- a/desktop.blocks/github/github.js
+++ b/desktop.blocks/github/github.js
@@ -1,9 +1,11 @@
 /** @requires BEM */
 /** @requires BEM.DOM */
 
-modules.define('i-bem__dom', function(provide, DOM) {
+modules.define(
+    { block: 'github' },
+    function(provide) {
 
-DOM.decl('github', {
+provide({
 
     onSetMod : {
 
@@ -24,6 +26,4 @@ DOM.decl('github', {
 
 });
 
-provide(DOM);
-
 });
diff --git a/desktop.blocks/highlight/__init/highlight__init.js b/desktop.blocks/highlight/__init/highlight__init.js
index d87e48064..634197596 100644
--- a/desktop.blocks/highlight/__init/highlight__init.js
+++ b/desktop.blocks/highlight/__init/highlight__init.js
@@ -1,9 +1,12 @@
 /** @requires BEM */
 /** @requires BEM.DOM */
 
-modules.define('i-bem__dom', ['jquery'], function(provide, $, DOM) {
+modules.define(
+    { block: 'highlight' },
+    ['jquery'],
+    function(provide, $) {
 
-DOM.decl('highlight', {
+provide({
     getCodeContainer: function() {
         this._codeContainer = this._codeContainer || this.domElem.find('pre code')[0];
         return this._codeContainer;
@@ -19,6 +22,4 @@ DOM.decl('highlight', {
     }
 });
 
-provide(DOM);
-
 });
diff --git a/desktop.blocks/recent-posts/recent-posts.js b/desktop.blocks/recent-posts/recent-posts.js
index 9602c4bca..1892bb876 100644
--- a/desktop.blocks/recent-posts/recent-posts.js
+++ b/desktop.blocks/recent-posts/recent-posts.js
@@ -1,9 +1,12 @@
 /** @requires BEM */
 /** @requires BEM.DOM */
 
-modules.define('i-bem__dom', ['jquery', 'colors'], function(provide, $, colors, DOM) {
+modules.define(
+    { block: 'recent-posts' },
+    ['jquery', 'colors'],
+    function(provide, $, colors) {
 
-DOM.decl('recent-posts', {
+provide({
 
     onSetMod : {
 
@@ -23,6 +26,4 @@ DOM.decl('recent-posts', {
 
 });
 
-provide(DOM);
-
 });