diff --git a/after/syntax/java.vim b/after/syntax/java.vim
index d10f112..c19ec2b 100644
--- a/after/syntax/java.vim
+++ b/after/syntax/java.vim
@@ -36,8 +36,6 @@ syntax match   javaOdysseyType            "\%(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>
 syntax match   javaOdysseyConstructor     "\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=\%((\|\[\)"me=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseySeparator
 syntax match   javaOdysseyMethod          "\<\l\w*\>("me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
 syntax match   javaOdysseyDotOperator     "\<\u\w*\>\."me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
-syntax match   javaOdysseyEnumValue       "\<[A-Z][_A-Z0-9]\+\>" containedin=javaParenT,javaParenT1,javaParenT2,javaLabelRegion
-syntax match   javaOdysseyEnumConstructor "\<[A-Z][_A-Z0-9]\+\>("me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
 syntax match   javaOdysseyCasting         "(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator
 syntax match   javaOdysseyGetClass        "\%(\<import\>\s\+\%(\w\+\.\)\+\)\@<=\%(\u\w*\)\%(\s*;\)\@="
 syntax match   javaOdysseyGetStaticMethod "\%(\<import\>\s\+\<static\>\s\+\%(\w\+\.\)\+\)\@<=\%(\l\w*\)\%(\s*;\)\@="
@@ -46,6 +44,7 @@ syntax match   javaOdysseyExtends         "\%(\<extends\>\s\+\)\@<=\%(\<\u\w*\>\
 syntax match   javaOdysseyImplements      "\%(\<implements\>\s\+\)\@<=\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=" contains=javaOdysseyGeneric,javaOdysseySeparator
 syntax match   javaOdysseyMethodRef       "::\<\l\w*\>"ms=s+2 containedin=javaParenT,javaParenT1,javaParenT2
 syntax match   javaOdysseyClassMethodRef  "\<\u\w*\>::"me=e-2 containedin=javaParenT,javaParenT1,javaParenT2
+syntax match   javaOdysseyEnumValue       "\<\u\u*\>" containedin=javaParenT,javaParenT1,javaParenT2
 syntax region  javaOdysseyComment         start=+/\*+ end=+\*/+ transparent fold keepend
 syntax region  javaOdysseyImport          start=/\%(^import\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
 syntax region  javaOdysseyImportStatic    start=/\%(^import static\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
diff --git a/colors/odyssey.vim b/colors/odyssey.vim
index 9be438d..2e71b92 100644
--- a/colors/odyssey.vim
+++ b/colors/odyssey.vim
@@ -286,8 +286,7 @@ call s:l(         'javaOdysseyMethod',        'Function')
 call s:l(           'javaOdysseyThis',         'Special')
 call s:l(          'javaOdysseyArrow',        'Operator')
 call s:l(         'javaOdysseyLombok',       'Statement')
-call s:l(      'javaOdysseyEnumValue',        'Constant')
-call s:l('javaOdysseyEnumConstructor',        'Constant')
+call s:l(      'javaOdysseyEnumValue',            'Type')
 call s:l(      'javaOdysseyMethodRef',        'Function')
 call s:l( 'javaOdysseyClassMethodRef',            'Type')