diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j
index 6fe63b8a8..33781be35 100644
--- a/AppKit/CPControl.j
+++ b/AppKit/CPControl.j
@@ -505,10 +505,12 @@ var CPControlBlackColor     = [CPColor blackColor];
 }
 
 #define BRIDGE(UPPERCASE, LOWERCASE, ATTRIBUTENAME) \
+/*! Sets the value for ATTRIBUTENAME */\
 - (void)set##UPPERCASE:(id)aValue\
 {\
 [self setValue:aValue forThemeAttribute:ATTRIBUTENAME];\
 }\
+/*! Returns the current value for ATTRIBUTENAME */\
 - (id)LOWERCASE\
 {\
 return [self valueForThemeAttribute:ATTRIBUTENAME];\
diff --git a/Tools/Documentation/Cappuccino.doxygen b/Tools/Documentation/Cappuccino.doxygen
index 5c81778b3..f0ca1337a 100644
--- a/Tools/Documentation/Cappuccino.doxygen
+++ b/Tools/Documentation/Cappuccino.doxygen
@@ -247,7 +247,7 @@ PERLMOD_MAKEVAR_PREFIX =
 # Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =