diff --git a/uppsrc/Core/core.upt b/uppsrc/Core/core.upt
index a32df36a6..de3fe830e 100644
--- a/uppsrc/Core/core.upt
+++ b/uppsrc/Core/core.upt
@@ -1,4 +1,4 @@
-template "Core console project" main;
+template "U++ Core console project" main;
 
 option "Create header" header;
 option "Commandline loop" cmdline;
diff --git a/uppsrc/CtrlCore/CocoImage.mm b/uppsrc/CtrlCore/CocoImage.mm
index ea8a1f452..4c51f48d1 100644
--- a/uppsrc/CtrlCore/CocoImage.mm
+++ b/uppsrc/CtrlCore/CocoImage.mm
@@ -87,7 +87,8 @@ void SystemDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
 		CGContextDrawImage(cgHandle, CGRectMake(0, -isz.cy, isz.cx, isz.cy), sd.cgimg);
 	    CGContextRestoreGState(cgHandle);
 	}
-	cg_image_cache.Shrink(4 * 1024 * 768, 1000); // Cache must be after Paint because of PaintOnly!
+	Size sz = Ctrl::GetPrimaryScreenArea().GetSize();
+	cache.Shrink(4 * sz.cx * sz.cy, 1000); // Cache must be after Paint because of PaintOnly!
 }
 
 // TODO: https://stackoverflow.com/questions/10733228/native-osx-lion-resize-cursor-for-custom-nswindow-or-nsview
diff --git a/uppsrc/CtrlCore/GtkDrawImage.cpp b/uppsrc/CtrlCore/GtkDrawImage.cpp
index dfcf3a421..5d1ff2b6a 100644
--- a/uppsrc/CtrlCore/GtkDrawImage.cpp
+++ b/uppsrc/CtrlCore/GtkDrawImage.cpp
@@ -101,7 +101,8 @@ void SystemDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
 		cairo_set_source_surface(cr, sd.surface, x, y);
 		cairo_paint(cr);
 	}
-	cache.Shrink(4 * 1024 * 768, 1000); // Cache must be after Paint because of PaintOnly!
+	Size sz = Ctrl::GetPrimaryScreenArea().GetSize();
+	cache.Shrink(4 * sz.cx * sz.cy, 1000); // Cache must be after Paint because of PaintOnly!
 }
 
 Draw& ImageDraw::Alpha()
diff --git a/uppsrc/CtrlLib/Complex.upt b/uppsrc/CtrlLib/Complex.upt
index 253d03346..97a129d64 100644
--- a/uppsrc/CtrlLib/Complex.upt
+++ b/uppsrc/CtrlLib/Complex.upt
@@ -1,4 +1,4 @@
-template "CtrlLib application with main window" main;
+template "U++ CtrlLib application with main window" main;
 
 id     "Main window class name" classname = PACKAGE;
 select("No layouts", "Generate layout file", "Main window has layout", "Main window has OK/Cancel")
diff --git a/uppsrc/CtrlLib/Normal.upt b/uppsrc/CtrlLib/Normal.upt
index e3b4907e6..20beded6d 100644
--- a/uppsrc/CtrlLib/Normal.upt
+++ b/uppsrc/CtrlLib/Normal.upt
@@ -1,4 +1,4 @@
-template "Basic CtrlLib application" main;
+template "U++ Basic CtrlLib application" main;
 
 option "Create header" header;
 
diff --git a/uppsrc/Skylark/Skylark.upt b/uppsrc/Skylark/Skylark.upt
index cb9f10890..7b92cdc5d 100644
--- a/uppsrc/Skylark/Skylark.upt
+++ b/uppsrc/Skylark/Skylark.upt
@@ -1,4 +1,4 @@
-template "Skylark Web application" main;
+template "U++ Skylark Web application" main;
 
 id     "Application name"    classname = PACKAGE;
 id     "Main page root path" root = PACKAGE;
diff --git a/uppsrc/upt/SDLCore.upt b/uppsrc/upt/SDLCore.upt
index 567163f8c..50b5674a7 100644
--- a/uppsrc/upt/SDLCore.upt
+++ b/uppsrc/upt/SDLCore.upt
@@ -1,4 +1,4 @@
-template "SDL with Core package" main;
+template "U++ Core with SDL" main;
 
 option "Create header" header;
 option "Initialize video" video;