diff --git a/src/WebPi/TBEX.xml b/src/WebPi/TBEX.xml
new file mode 100644
index 0000000000..8f59460f1b
--- /dev/null
+++ b/src/WebPi/TBEX.xml
@@ -0,0 +1,76 @@
+
+
+
+
+ Start Here
+ First time here? Complete the installation of your Umbraco Site, select a Starter Kit and Skin to get you started.
+ /install/default.aspx
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/umbraco.png
+
+
+ Getting Started with Umbraco
+ So you've finished installing Umbraco in WebMatrix, what next? Learn how to build and configure your new site!
+ http://our.umbraco.org/wiki/how-tos/getting-started-with-umbraco-what-is-next-after-you-install
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/umbraco.png
+
+
+ Extending Umbraco using WebMatrix
+ In this 5-minute video tutorial you'll learn how to edit templates, use the Razor syntax to add dynamic functionality and deploy an Umbraco site - all from within WebMatrix.
+ http://umbraco.com/help-and-support/video-tutorials/getting-started/working-with-webmatrix
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/umbraco.png
+
+
+ Umbraco Forum - Where the friendliest CMS community on the planet helps each other
+ Search for documentation, get help and guidance from seasoned experts, download and collaborate on plugins and extensions.
+ http://our.umbraco.org/
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/community.png
+
+
+ Umbraco Products
+ We have additional products and services available to help you get the most out of Umbraco.
+ http://umbraco.com/products
+ http://umbraco.com/products
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/products.png
+
+
+ Umbraco Community Projects - "The Deli"
+ Find free and commercial add-ons, extensions, skins, and starter sites.
+ http://our.umbraco.org/projects
+ http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/deli.png
+
+
+
+
+
+
+/umbraco/default.aspx
+http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/umbraco.png
+
+
+
+
+http://our.umbraco.org/
+http://cdn.umbraco.org/cdn/umbraco/images/webmatrix/community.png
+
+
+
+
+
+
+ install
+
+
+ web.config
+
+
+ bin
+
+
+ umbraco
+
+
+ umbraco_client
+
+
+
+
diff --git a/src/WebPi/installSQL.sql b/src/WebPi/installSQL.sql
deleted file mode 100644
index c998bcbfcd..0000000000
--- a/src/WebPi/installSQL.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-/**********************************************************************/
-/* Install.SQL */
-/* Creates a login and makes the user a member of db roles */
-/* */
-/**********************************************************************/
-
--- Declare variables for database name, username and password
-DECLARE @dbName sysname,
- @dbUser sysname,
- @dbPwd nvarchar(max);
-
--- Set variables for database name, username and password
-SET @dbName = 'PlaceHolderForDb';
-SET @dbUser = 'PlaceHolderForUser';
-SET @dbPwd = 'PlaceHolderForPassword';
-
-DECLARE @cmd nvarchar(max)
-
--- Create login
-IF( SUSER_SID(@dbUser) is null )
-BEGIN
- print '-- Creating login '
- SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
- EXEC(@cmd)
-END
-
--- Create database user and map to login
--- and add user to the datareader, datawriter, ddladmin and securityadmin roles
---
-SET @cmd = N'USE ' + quotename(@DBName) + N';
-IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
-BEGIN
- print ''-- Creating user'';
- CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_ddladmin'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_securityadmin'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_datareader'', ''' + replace(@dbUser, '''', '''''') + N''';
- print ''-- Adding user'';
- EXEC sp_addrolemember ''db_datawriter'', ''' + replace(@dbUser, '''', '''''') + N''';
-END'
-EXEC(@cmd)
-GO
\ No newline at end of file
diff --git a/src/WebPi/installSQL1.sql b/src/WebPi/installSQL1.sql
new file mode 100644
index 0000000000..8abdf52c43
--- /dev/null
+++ b/src/WebPi/installSQL1.sql
@@ -0,0 +1,9 @@
+/**********************************************************************/
+/* Install.SQL */
+/* Creates a login and makes the user a member of db roles */
+/* */
+/* Modifications for SQL AZURE - ON MASTER */
+/**********************************************************************/
+
+
+CREATE LOGIN PlaceHolderForUser WITH PASSWORD = 'PlaceHolderForPassword'
\ No newline at end of file
diff --git a/src/WebPi/installSQL2.sql b/src/WebPi/installSQL2.sql
new file mode 100644
index 0000000000..5c112d7fbb
--- /dev/null
+++ b/src/WebPi/installSQL2.sql
@@ -0,0 +1,18 @@
+/**********************************************************************/
+/* CreateUser.SQL */
+/* Creates a user and makes the user a member of db roles */
+/* This script runs against the User database and requires connection string */
+/* Supports SQL Server and SQL AZURE */
+/**********************************************************************/
+
+-- Create database user and map to login
+-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
+--
+
+CREATE USER PlaceHolderForUser FOR LOGIN PlaceHolderForUser;
+GO
+EXEC sp_addrolemember 'db_ddladmin', PlaceHolderForUser;
+EXEC sp_addrolemember 'db_securityadmin', PlaceHolderForUser;
+EXEC sp_addrolemember 'db_datareader', PlaceHolderForUser;
+EXEC sp_addrolemember 'db_datawriter', PlaceHolderForUser;
+GO
diff --git a/src/WebPi/manifest.xml b/src/WebPi/manifest.xml
index 4d6316a677..326beb5f71 100644
--- a/src/WebPi/manifest.xml
+++ b/src/WebPi/manifest.xml
@@ -2,51 +2,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/src/WebPi/parameters.xml b/src/WebPi/parameters.xml
index d57de23102..8efe1e9506 100644
--- a/src/WebPi/parameters.xml
+++ b/src/WebPi/parameters.xml
@@ -1,4 +1,4 @@
-
+
@@ -13,77 +13,77 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
@@ -92,19 +92,22 @@
-
+
+
-
+
+
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/WebPi/umbraco/favicon.ico b/src/WebPi/umbraco/favicon.ico
new file mode 100644
index 0000000000..e3ea01cf10
Binary files /dev/null and b/src/WebPi/umbraco/favicon.ico differ