diff --git a/FModel/Resources/Cpp.xshd b/FModel/Resources/Cpp.xshd
index f61b1264..89c82780 100644
--- a/FModel/Resources/Cpp.xshd
+++ b/FModel/Resources/Cpp.xshd
@@ -18,6 +18,7 @@
+ (\/\/.*|\/\*[\s\S]*?\*\/)
@@ -44,10 +45,19 @@
Int16
Int32
Int64
+ int8
+ int16
+ int32
+ int64
uint
+ UInt8
UInt16
UInt32
UInt64
+ uint8
+ uint16
+ uint32
+ uint64
float
double
bool
@@ -83,6 +93,7 @@
inline
constexpr
default
+ &&
@@ -120,8 +131,6 @@
[\[\]\{\}]
- (\/\/.*|\/\*[\s\S]*?\*\/)
-
\b[A-Za-z_][A-Za-z0-9_]*\b(?=<)