diff --git a/reactos/dll/win32/uxtheme/draw.c b/reactos/dll/win32/uxtheme/draw.c
index 237d409f201..4546b2995cd 100644
--- a/reactos/dll/win32/uxtheme/draw.c
+++ b/reactos/dll/win32/uxtheme/draw.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/main.c b/reactos/dll/win32/uxtheme/main.c
index 7553a83dd8d..1cf124d603f 100644
--- a/reactos/dll/win32/uxtheme/main.c
+++ b/reactos/dll/win32/uxtheme/main.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/metric.c b/reactos/dll/win32/uxtheme/metric.c
index e8936dd81f3..fa3bb61fb22 100644
--- a/reactos/dll/win32/uxtheme/metric.c
+++ b/reactos/dll/win32/uxtheme/metric.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
@@ -151,8 +151,8 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue)
     TRACE("(%p, %d)\n", hTheme, iIntID);
     if(!hTheme)
         return E_HANDLE;
-    if(iIntID <= TMT_FIRSTINT || iIntID >= TMT_LASTINT) {
-        TRACE("Unknown IntID: %d\n", iIntID);
+    if(iIntID < TMT_FIRSTINT || iIntID > TMT_LASTINT) {
+        WARN("Unknown IntID: %d\n", iIntID);
         return STG_E_INVALIDPARAMETER;
     }
     if((tp = MSSTYLES_FindMetric(TMT_INT, iIntID)))
@@ -215,8 +215,8 @@ HRESULT WINAPI GetThemeSysString(HTHEME hTheme, int iStringID,
     TRACE("(%p, %d)\n", hTheme, iStringID);
     if(!hTheme)
         return E_HANDLE;
-    if(iStringID <= TMT_FIRSTSTRING || iStringID >= TMT_LASTSTRING) {
-        TRACE("Unknown StringID: %d\n", iStringID);
+    if(iStringID < TMT_FIRSTSTRING || iStringID > TMT_LASTSTRING) {
+        WARN("Unknown StringID: %d\n", iStringID);
         return STG_E_INVALIDPARAMETER;
     }
     if((tp = MSSTYLES_FindMetric(TMT_STRING, iStringID)))
diff --git a/reactos/dll/win32/uxtheme/msstyles.c b/reactos/dll/win32/uxtheme/msstyles.c
index 77af7087c9e..76414d90867 100644
--- a/reactos/dll/win32/uxtheme/msstyles.c
+++ b/reactos/dll/win32/uxtheme/msstyles.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/msstyles.h b/reactos/dll/win32/uxtheme/msstyles.h
index 76b83f04c08..c333a2affb7 100644
--- a/reactos/dll/win32/uxtheme/msstyles.h
+++ b/reactos/dll/win32/uxtheme/msstyles.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifndef __WINE_MSSTYLES_H
diff --git a/reactos/dll/win32/uxtheme/property.c b/reactos/dll/win32/uxtheme/property.c
index 4c8bb7fa4b1..0d40f4cbe16 100644
--- a/reactos/dll/win32/uxtheme/property.c
+++ b/reactos/dll/win32/uxtheme/property.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/stylemap.c b/reactos/dll/win32/uxtheme/stylemap.c
index a113d703449..4be9819c63f 100644
--- a/reactos/dll/win32/uxtheme/stylemap.c
+++ b/reactos/dll/win32/uxtheme/stylemap.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/system.c b/reactos/dll/win32/uxtheme/system.c
index 79151acfdb9..c834c52c1cb 100644
--- a/reactos/dll/win32/uxtheme/system.c
+++ b/reactos/dll/win32/uxtheme/system.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/uxini.c b/reactos/dll/win32/uxtheme/uxini.c
index aaf3b122de6..85efdb1f19d 100644
--- a/reactos/dll/win32/uxtheme/uxini.c
+++ b/reactos/dll/win32/uxtheme/uxini.c
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "config.h"
diff --git a/reactos/dll/win32/uxtheme/uxthemedll.h b/reactos/dll/win32/uxtheme/uxthemedll.h
index 96bb34ade21..ed37e725ff6 100644
--- a/reactos/dll/win32/uxtheme/uxthemedll.h
+++ b/reactos/dll/win32/uxtheme/uxthemedll.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #ifndef __WINE_UXTHEMEDLL_H
diff --git a/reactos/dll/win32/uxtheme/version.rc b/reactos/dll/win32/uxtheme/version.rc
index 3e38d1ff01f..fdeec0a0ab6 100644
--- a/reactos/dll/win32/uxtheme/version.rc
+++ b/reactos/dll/win32/uxtheme/version.rc
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #define WINE_FILENAME_STR "uxtheme.dll"