diff --git a/package.json b/package.json
index bc194d4..2e715e9 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
   "author": "unimonkiez",
   "license": "MIT",
   "dependencies": {
-    "emoji-datasource": "2.4.x"
+    "emoji-datasource": "4.0.x"
   },
   "devDependencies": {
     "absurd": "^0.3.34",
diff --git a/src/map.js b/src/map.js
index c2f4dc8..dd020dd 100644
--- a/src/map.js
+++ b/src/map.js
@@ -4,14 +4,14 @@ const SIZE = Constant.SIZE;
 const CATEGORY = Constant.CATEGORY;
 
 const categoryDataMap = {
-  Activity: CATEGORY.ACTIVITY,
-  Flags: CATEGORY.FLAGS,
-  Foods: CATEGORY.FOODS,
-  Nature: CATEGORY.NATURE,
-  Objects: CATEGORY.OBJECTS,
-  People: CATEGORY.PEOPLE,
-  Places: CATEGORY.PLACES,
-  Symbols: CATEGORY.SYMBOLS
+  'Activities': CATEGORY.ACTIVITY,
+  'Flags': CATEGORY.FLAGS,
+  'Food & Drink': CATEGORY.FOODS,
+  'Animals & Nature': CATEGORY.NATURE,
+  'Objects': CATEGORY.OBJECTS,
+  'Smileys & People': CATEGORY.PEOPLE,
+  'Travel & Places': CATEGORY.PLACES,
+  'Symbols': CATEGORY.SYMBOLS
 };
 
 const categoryNameMap = {
diff --git a/src/set.js b/src/set.js
index 8552531..bd6474b 100644
--- a/src/set.js
+++ b/src/set.js
@@ -72,7 +72,7 @@ module.exports = (api, imageSet, size) => {
   }, categoryOrder.reduce((catObj, category) => Object.assign(catObj,
     emojiData[category].reduce((emojiObj, emoji) => Object.assign(emojiObj, {
       [`.ep-e[data-index="${emoji.index}"]`]: Object.assign({
-        'background-position': `-${sizeNumber * emoji.sheet_x}px -${sizeNumber * emoji.sheet_y}px`
+        'background-position': `-${((2 + sizeNumber) * emoji.sheet_x) + 1}px -${((2 + sizeNumber) * emoji.sheet_y) + 1}px`
       }, !emoji[getBoolNameByImageSet(imageSet)] && {
         display: 'none'
       })