diff --git a/Gopkg.lock b/Gopkg.lock
index d8e540f8..a99506fb 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -65,14 +65,6 @@
   revision = "f2bb620afb315242706942e6ca4c7d26ee5ed627"
   version = "v1.17.9"
 
-[[projects]]
-  digest = "1:059a2b78634d380e57ecea2cb780b17d506b7f4ca872e2f44849709903bedec5"
-  name = "github.com/bobheadxi/emoji"
-  packages = ["."]
-  pruneopts = "NUT"
-  revision = "cbb51e81aa7115c66cf47164ba810f44baa29067"
-  version = "v2.2.0"
-
 [[projects]]
   digest = "1:90f59f03e8a0c973faff6d6122a4000efaee118907b5c695cc7615d2d8240538"
   name = "github.com/boombuler/barcode"
@@ -265,12 +257,12 @@
   version = "0.5"
 
 [[projects]]
-  digest = "1:d80983f72b52b2801805cf00400fe9aa0024e8167b1eac21e95175a1a8a06a49"
+  branch = "master"
+  digest = "1:059a2b78634d380e57ecea2cb780b17d506b7f4ca872e2f44849709903bedec5"
   name = "github.com/kyokomi/emoji"
   packages = ["."]
   pruneopts = "NUT"
-  revision = "eba9a9d7bfd64dcfe6e90fb3d53b2f3357a015c3"
-  version = "v2.1.0"
+  revision = "51762253ec2b5dafce2d33adfb0d49121924ee58"
 
 [[projects]]
   digest = "1:08c231ec84231a7e23d67e4b58f975e1423695a32467a362ee55a803f9de8061"
@@ -580,7 +572,6 @@
     "github.com/aws/aws-sdk-go/aws/credentials",
     "github.com/aws/aws-sdk-go/aws/session",
     "github.com/aws/aws-sdk-go/service/ec2",
-    "github.com/bobheadxi/emoji",
     "github.com/dgrijalva/jwt-go",
     "github.com/docker/docker/api/types",
     "github.com/docker/docker/api/types/container",
diff --git a/Gopkg.toml b/Gopkg.toml
index 98f504a5..16870fde 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -38,3 +38,7 @@
 [[constraint]]
   name = "github.com/docker/docker"
   branch = "master"
+
+[[constraint]]
+  name = "github.com/kyokomi/emoji"
+  branch = "master"
diff --git a/cmd/core/utils/out/decor.go b/cmd/core/utils/out/decor.go
index a6382abb..c30ff6eb 100644
--- a/cmd/core/utils/out/decor.go
+++ b/cmd/core/utils/out/decor.go
@@ -1,14 +1,11 @@
 package out
 
 import (
-	// use bobheadxi/emoji until https://github.com/kyokomi/emoji/pull/32 gets
-	// merged, for Stringer compatibility for the Colour class
-
 	"fmt"
 	"os"
 
-	"github.com/bobheadxi/emoji"
 	"github.com/fatih/color"
+	"github.com/kyokomi/emoji"
 )
 
 const (