diff --git a/Makefile.common b/Makefile.common
index 6ad3691cdc..5f10eaa0c3 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1733,9 +1733,9 @@ OBJ += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.o \
        $(LIBRETRO_COMM_DIR)/formats/json/jsonsax_full.o \
        $(LIBRETRO_COMM_DIR)/formats/image_transfer.o
 
-# Easter Egg
-ifeq ($(HAVE_EASTEREGG),1)
-  DEFINES += -DHAVE_EASTEREGG
+# Gong embedded core
+ifeq ($(HAVE_GONG),1)
+  DEFINES += -DHAVE_GONG
   OBJ += cores/libretro-gong/gong.o
 endif
 
diff --git a/Makefile.griffin b/Makefile.griffin
index 94b51de2b0..d26375b56b 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -439,7 +439,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
    CXX = cl.exe
    LD = link.exe
 
-   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -DHAVE_EASTEREGG -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
+   PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib
 
    PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH)
@@ -491,7 +491,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    LD = link.exe
 
    PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_EASTEREGG -DHAVE_CDROM
+   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib msimg32.lib
 
    PlatformSuffix = $(subst windows_msvc2010_,,$(platform))
@@ -565,7 +565,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    LD = link.exe
 
    PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_EASTEREGG -DHAVE_CDROM
+   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
 
    PlatformSuffix = $(subst windows_msvc2012_,,$(platform))
@@ -643,7 +643,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    LD = link.exe
 
    PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_EASTEREGG -DHAVE_CDROM
+   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
 
    PlatformSuffix = $(subst windows_msvc2013_,,$(platform))
@@ -722,7 +722,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
 
    PLATCFLAGS += -utf-8
    PLATCFLAGS += -D_WIN32 -D__STDC_CONSTANT_MACROS -D_MBCS
-   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_EASTEREGG -DHAVE_CDROM
+   PLATCFLAGS += -D__i686__ -D__MMX__ -D__SSE__ -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINDOWS -DHAVE_CC_RESAMPLER -DHAVE_GL_SYNC -DHAVE_GLSL -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_OPENGL -DHAVE_SHADERPIPELINE -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DWIN32 -DHAVE_CDROM
    LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib iphlpapi.lib
 
    PlatformSuffix = $(subst windows_msvc2015_,,$(platform))
@@ -806,7 +806,7 @@ else ifneq (,$(findstring unix,$(platform)))
    HAVE_GRIFFIN_CPP         := 1
    WANT_GLSLANG							:= 1
 
-   PLATCFLAGS += -DHAVE_EASTEREGG -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_MENU_WIDGETS -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_PULSE
+   PLATCFLAGS += -D__MMX__ -D__SSE__ -DHAVE_OPENGL -DHAVE_OPENGL1 -DHAVE_GLSL -DHAVE_SHADERPIPELINE -DHAVE_OZONE -DHAVE_CC_RESAMPLER -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_FBO -DHAVE_GL_SYNC -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_IMAGEVIEWER -DHAVE_LANGEXTRA -DHAVE_RUNAHEAD -DHAVE_MENU_WIDGETS -DHAVE_SPIRV_CROSS -DHAVE_STB_FONT -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES -DHAVE_VULKAN -DHAVE_XMB -DRARCH_INTERNAL -DWANT_GLSLANG -DHAVE_X11 -DHAVE_XCB -DHAVE_UDEV -DHAVE_PULSE
    EXT_TARGET := $(TARGET_NAME)
    EXT_INTER_TARGET := $(TARGET_NAME)
    INCLUDE += -Ilibretro-common/include -Igfx/include -Ideps -Ideps/stb -Ideps/rcheevos/include -Ideps/SPIRV-Cross -Ideps/glslang -I.
diff --git a/cores/internal_cores.h b/cores/internal_cores.h
index ff20a5180a..250e33832f 100644
--- a/cores/internal_cores.h
+++ b/cores/internal_cores.h
@@ -360,7 +360,7 @@ size_t libretro_videoprocessor_retro_get_memory_size(unsigned id);
 
 #endif
 
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
 /* Internal gong core. */
 
 void libretro_gong_retro_init(void);
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 7ca5a0ec93..2b2af0d0df 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1646,7 +1646,7 @@ SSL
 #endif
 #endif
 
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
 #include "../cores/libretro-gong/gong.c"
 #endif
 
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index 8f58585140..5076268fa5 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -1243,6 +1243,8 @@ MSG_HASH(MENU_ENUM_LABEL_START_CORE,
       "start_core")
 MSG_HASH(MENU_ENUM_LABEL_START_NET_RETROPAD,
       "menu_start_net_retropad")
+MSG_HASH(MENU_ENUM_LABEL_START_GONG,
+      "menu_start_gong")
 MSG_HASH(MENU_ENUM_LABEL_START_VIDEO_PROCESSOR,
       "menu_start_video_processor")
 MSG_HASH(MENU_ENUM_LABEL_STATE_SLOT,
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 2127438af3..a3cceb374b 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -10276,3 +10276,7 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS,
     "Change haptic feedback and vibration settings."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_START_GONG,
+    "Start Gong"
+    )
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index e94c15d6fd..a686377894 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3272,6 +3272,7 @@ static int (funcname)(const char *path, const char *label, unsigned type, size_t
 }
 
 default_action_ok_start_builtin_core(action_ok_start_net_retropad_core, CORE_TYPE_NETRETROPAD)
+default_action_ok_start_builtin_core(action_ok_start_gong_core, CORE_TYPE_GONG)
 default_action_ok_start_builtin_core(action_ok_start_video_processor_core, CORE_TYPE_VIDEO_PROCESSOR)
 
 #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
@@ -6244,6 +6245,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_START_NET_RETROPAD:
             BIND_ACTION_OK(cbs, action_ok_start_net_retropad_core);
             break;
+         case MENU_ENUM_LABEL_START_GONG:
+            BIND_ACTION_OK(cbs, action_ok_start_gong_core);
+            break;
          case MENU_ENUM_LABEL_START_VIDEO_PROCESSOR:
             BIND_ACTION_OK(cbs, action_ok_start_video_processor_core);
             break;
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index c023f3ac42..d090089c2d 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3558,6 +3558,14 @@ bool menu_displaylist_process(menu_displaylist_info_t *info)
             MENU_ENUM_LABEL_START_NET_RETROPAD,
             MENU_SETTING_ACTION, 0, 0);
 #endif
+
+#ifdef HAVE_GONG
+      menu_entries_append_enum(info->list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_START_GONG),
+            msg_hash_to_str(MENU_ENUM_LABEL_START_GONG),
+            MENU_ENUM_LABEL_START_GONG,
+            MENU_SETTING_ACTION, 0, 0);
+#endif
    }
 
    if (!string_is_empty(new_entry))
diff --git a/msg_hash.h b/msg_hash.h
index fb20ffcfc4..fc6763f286 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -669,6 +669,7 @@ enum msg_hash_enums
 
    MENU_LABEL(START_VIDEO_PROCESSOR),
    MENU_LABEL(START_NET_RETROPAD),
+   MENU_LABEL(START_GONG),
 
    MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
 
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 21d60c944e..4a9894cbc0 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -151,7 +151,7 @@ HAVE_OSMESA=no             # Off-screen Mesa rendering
 HAVE_VIDEOPROCESSOR=auto   # Enable video processor core
 HAVE_VIDEOCORE=auto        # Broadcom Videocore 4 support
 HAVE_DRMINGW=no            # DrMingw exception handler
-HAVE_EASTEREGG=yes         # Easter egg
+HAVE_GONG=no               # Gong core embedded
 HAVE_CDROM=auto            # CD-ROM support
 HAVE_GLSL=yes              # GLSL shaders support
 HAVE_SLANG=auto            # slang support
diff --git a/retroarch.c b/retroarch.c
index ac3f4ba1aa..851d7ed2b4 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2000,7 +2000,7 @@ enum rarch_content_type path_is_media_type(const char *path)
       case FILE_TYPE_XM:
          return RARCH_CONTENT_MUSIC;
 #endif
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
       case FILE_TYPE_GONG:
          return RARCH_CONTENT_GONG;
 #endif
@@ -8562,7 +8562,7 @@ static dylib_t lib_handle;
 #define SYMBOL_VIDEOPROCESSOR(x) current_core->x = libretro_videoprocessor_##x
 #endif
 
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
 #define SYMBOL_GONG(x) current_core->x = libretro_gong_##x
 #endif
 
@@ -10427,7 +10427,7 @@ static bool init_libretro_symbols_custom(enum rarch_core_type type,
 #endif
          break;
       case CORE_TYPE_GONG:
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
          CORE_SYMBOLS(SYMBOL_GONG);
 #endif
          break;
@@ -25076,7 +25076,7 @@ bool retroarch_main_init(int argc, char *argv[])
                }
                break;
 #endif
-#ifdef HAVE_EASTEREGG
+#ifdef HAVE_GONG
             case RARCH_CONTENT_GONG:
                retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
                retroarch_set_current_core_type(CORE_TYPE_GONG, false);
@@ -26562,9 +26562,6 @@ static enum runloop_state runloop_check_state(void)
    bool menu_is_alive                  = menu_driver_alive;
    unsigned menu_toggle_gamepad_combo  = settings->uints.input_menu_toggle_gamepad_combo;
    bool display_kb                     = menu_input_dialog_get_display_kb_internal();
-#ifdef HAVE_EASTEREGG
-   static uint64_t seq                 = 0;
-#endif
 #endif
 
 #ifdef HAVE_MENU_WIDGETS
@@ -26914,34 +26911,6 @@ static enum runloop_state runloop_check_state(void)
          if (settings->bools.audio_enable_menu &&
                !libretro_running)
             audio_driver_menu_sample();
-
-#ifdef HAVE_EASTEREGG
-         {
-            bool library_name_is_empty = string_is_empty(runloop_system.info.library_name);
-
-            if (library_name_is_empty && trigger_input.data[0])
-            {
-               seq |= trigger_input.data[0] & 0xF0;
-
-               if (seq == 1157460427127406720ULL)
-               {
-                  content_ctx_info_t content_info;
-                  content_info.argc                   = 0;
-                  content_info.argv                   = NULL;
-                  content_info.args                   = NULL;
-                  content_info.environ_get            = NULL;
-
-                  task_push_start_builtin_core(
-                        &content_info,
-                        CORE_TYPE_GONG, NULL, NULL);
-               }
-
-               seq <<= 8;
-            }
-            else if (!library_name_is_empty)
-               seq = 0;
-         }
-#endif
       }
 
       old_input                 = current_bits;
@@ -26953,9 +26922,6 @@ static enum runloop_state runloop_check_state(void)
    else
 #endif
    {
-#if defined(HAVE_MENU) && defined(HAVE_EASTEREGG)
-      seq = 0;
-#endif
       if (runloop_idle)
       {
          retro_ctx.poll_cb();