diff --git a/.htaccess b/.htaccess
index c3f23d80..e0acf333 100644
--- a/.htaccess
+++ b/.htaccess
@@ -2,8 +2,7 @@
 Options +FollowSymLinks
 
 RewriteEngine On
-RewriteRule ^themes/([a-zA-Z\-\_\0-9]+)\/$ combine.php?type=css&theme=$1
-RewriteRule ^js/all combine.php?type=javascript
+RewriteRule ^js/all$ js
 
 # Turn on Expires and set default to 0
 ExpiresActive On
diff --git a/combine.php b/combine.php
index 74d6cb31..c70c6bca 100644
--- a/combine.php
+++ b/combine.php
@@ -1,207 +1,18 @@
 <?php
 
-	/************************************************************************
-	 * CSS and Javascript Combinator 0.5
-	 * Copyright 2006 by Niels Leenheer
-	 *
-	 * Permission is hereby granted, free of charge, to any person obtaining
-	 * a copy of this software and associated documentation files (the
-	 * "Software"), to deal in the Software without restriction, including
-	 * without limitation the rights to use, copy, modify, merge, publish,
-	 * distribute, sublicense, and/or sell copies of the Software, and to
-	 * permit persons to whom the Software is furnished to do so, subject to
-	 * the following conditions:
-	 * 
-	 * The above copyright notice and this permission notice shall be
-	 * included in all copies or substantial portions of the Software.
-	 *
-	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-	 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-	 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-	 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-	 * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-	 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-	 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	 */
+if (!isset($type) || !isset($elements))
+{
+	echo "\$type and \$elements must be specified!";
+	exit;
+}
 
+$contents = '';
+reset($elements);
+while (list(,$element) = each($elements)) {
+	$contents .= "\n\n" . file_get_contents($element);
+}
 
-	$cache 	  = true;
-	$write_combined = true;
-	$pullfromcache = false;
-	$theme = $_GET['theme'];
-	$cachedir = dirname(__FILE__) . '/cache';
-	$combinedir = dirname(__FILE__) . '/combined';
-	$cssdir   = dirname(__FILE__) . '/themes/' . $theme;
-	$jsdir    = dirname(__FILE__) . '/js';
-
-	// Determine the directory and type we should use
-	switch ($_GET['type']) {
-		case 'css':
-			$base = realpath($cssdir);
-			break;
-		case 'javascript':
-			$base = realpath($jsdir);
-			break;
-		default:
-			header ("HTTP/1.0 503 Not Implemented");
-			exit;
-	};
-
-	$type = $_GET['type'];
-	//$elements = explode(',', $_GET['files']);
-	
-	include($base . '/manifest.php');
-	
-	// Determine last modification date of the files
-	$lastmodified = 0;
-	while (list(,$element) = each($elements)) {
-		$thisbase = $base;
-		$thiselement = $element;
-		if( strpos($thiselement, "../") === 0 ){
-			$thiselement = str_replace("../","",$thiselement);
-			$thisbase = explode("/", $thisbase);
-			array_pop($thisbase);
-			$thisbase = implode("/", $thisbase);
-		}
-		$path = realpath($thisbase . '/' . $thiselement);
-		//echo $path;
-	
-		if (($type == 'javascript' && substr($path, -3) != '.js') || 
-			($type == 'css' && substr($path, -4) != '.css')) {
-			header ("HTTP/1.0 403 Forbidden");
-			exit;	
-		}
-	
-		if (substr($path, 0, strlen($thisbase)) != $thisbase || !file_exists($path)) {
-			header ("HTTP/1.0 404 Not Found");
-			exit;
-		}
-		
-		$lastmodified = max($lastmodified, filemtime($path));
-	}
-	
-	// Send Etag hash
-	$hash = $lastmodified . '-' . md5(implode('', $elements));
-	header ("Etag: \"" . $hash . "\"");
-	
-	if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && 
-		stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) == '"' . $hash . '"') 
-	{
-		// Return visit and no modifications, so do not send anything
-		header ("HTTP/1.0 304 Not Modified");
-		header ('Content-Length: 0');
-	} 
-	else 
-	{
-		// First time visit or files were modified
-		if ($cache) 
-		{
-			// Determine supported compression method
-			$gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
-			$deflate = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate');
-	
-			// Determine used compression method
-			$encoding = $gzip ? 'gzip' : ($deflate ? 'deflate' : 'none');
-	
-			// Check for buggy versions of Internet Explorer
-			if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && 
-				preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) {
-				$version = floatval($matches[1]);
-				
-				if ($version < 6)
-					$encoding = 'none';
-					
-				if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-					$encoding = 'none';
-			}
-			
-			// Try the cache first to see if the combined files were already generated
-			$cachefile = 'cache-' . $hash . '.' . $type . ($encoding != 'none' ? '.' . $encoding : '');
-			
-
-			if (file_exists($cachedir . '/' . $cachefile) && $pullfromcache == true) {
-				if ($fp = fopen($cachedir . '/' . $cachefile, 'rb')) {
-
-					if ($encoding != 'none') {
-						header ("Content-Encoding: " . $encoding);
-					}
-				
-					header ("Content-Type: text/" . $type);
-					header ("Content-Length: " . filesize($cachedir . '/' . $cachefile));
-		
-					fpassthru($fp);
-					fclose($fp);
-					exit;
-				}
-			}
-
-		}
-	
-		// Get contents of the files
-		$contents = '';
-		reset($elements);
-		while (list(,$element) = each($elements)) {
-			$path = realpath($base . '/' . $element);
-			$contents .= "\n\n" . file_get_contents($path);
-		}
-		
-		// Write pre gzipped files to disk
-		if ($write_combined) {
-			
-			if(!file_exists($combinedir)) {
-				mkdir($combinedir, 0700);
-			}
-			
-			$filename = '';
-			
-			//Determine the filename to use
-			switch ($_GET['type']) {
-				case 'css':
-					$filename = 'jquery.mobile.css';
-					break;
-				case 'javascript':
-					$filename = 'jquery.mobile.js';
-					break;
-				default:
-					header ("HTTP/1.0 503 Not Implemented");
-					exit;
-			};
-			
-			if ($fp = fopen($combinedir . '/' . $filename, 'wb')) {
-				fwrite($fp, $contents);
-				fclose($fp);
-			}
-		}
-	
-		// Send Content-Type
-		header ("Content-Type: text/" . $type);
-		
-		if (isset($encoding) && $encoding != 'none') 
-		{
-			// Send compressed contents
-			$contents = gzencode($contents, 9, $gzip ? FORCE_GZIP : FORCE_DEFLATE);
-			header ("Content-Encoding: " . $encoding);
-			header ('Content-Length: ' . strlen($contents));
-			echo $contents;
-		} 
-		else 
-		{
-			// Send regular contents
-			header ('Content-Length: ' . strlen($contents));
-			echo $contents;
-		}
-
-		// Store cache
-		if ($cache) {
-			
-			if(!file_exists($cachedir)) {
-				mkdir($cachedir, 0700);
-			}
-			
-			if ($fp = fopen($cachedir . '/' . $cachefile, 'wb')) {
-				fwrite($fp, $contents);
-				fclose($fp);
-			}
-		}
-	}	
-	
\ No newline at end of file
+header("Content-Type: " . $type);
+header("Content-Length: " . strlen($contents));
+echo $contents;
+?>
\ No newline at end of file
diff --git a/js/index.php b/js/index.php
new file mode 100644
index 00000000..b620444a
--- /dev/null
+++ b/js/index.php
@@ -0,0 +1,30 @@
+<?php
+$type = "text/javascript";
+$elements = array(
+	'jquery.js',
+	'jquery.ui.widget.js',
+	'jquery.mobile.widget.js',
+	'jquery.mobile.support.js',
+	'jquery.mobile.event.js',
+	'jquery.mobile.hashchange.js',
+	'jquery.mobile.page.js',
+	'jquery.mobile.fixHeaderFooter.js',
+	'jquery.mobile.forms.checkboxradio.js',
+	'jquery.mobile.forms.textinput.js',
+	'jquery.mobile.forms.select.js',
+	'jquery.mobile.buttonMarkup.js',
+	'jquery.mobile.forms.button.js',
+	'jquery.mobile.forms.slider.js',
+	'jquery.mobile.collapsible.js',
+	'jquery.mobile.controlGroup.js',
+	'jquery.mobile.fieldContain.js',
+	'jquery.mobile.listview.js',
+	'jquery.mobile.listview.filter.js',
+	'jquery.mobile.dialog.js',
+	'jquery.mobile.navbar.js',
+	'jquery.mobile.grid.js',
+	'jquery.mobile.js'
+);
+
+include('../combine2.php');
+?>
diff --git a/themes/default/index.php b/themes/default/index.php
new file mode 100644
index 00000000..969ac5a7
--- /dev/null
+++ b/themes/default/index.php
@@ -0,0 +1,23 @@
+<?php
+$type = "text/css";
+$elements = array(
+	'jquery.mobile.theme.css',
+	'jquery.mobile.core.css',
+	'jquery.mobile.transitions.css',
+	'jquery.mobile.grids.css',
+	'jquery.mobile.headerfooter.css',
+	'jquery.mobile.navbar.css',
+	'jquery.mobile.button.css',
+	'jquery.mobile.collapsible.css',
+	'jquery.mobile.controlgroup.css',
+	'jquery.mobile.dialog.css',
+	'jquery.mobile.forms.checkboxradio.css',
+	'jquery.mobile.forms.fieldcontain.css',
+	'jquery.mobile.forms.select.css',
+	'jquery.mobile.forms.textinput.css',
+	'jquery.mobile.listview.css',
+	'jquery.mobile.forms.slider.css'
+);
+
+include('../../combine2.php');
+?>
diff --git a/themes/valencia/index.php b/themes/valencia/index.php
new file mode 100644
index 00000000..763efc4f
--- /dev/null
+++ b/themes/valencia/index.php
@@ -0,0 +1,23 @@
+<?php
+$type = "text/css";
+$elements = array(
+	'jquery.mobile.theme.css',
+	'../default/jquery.mobile.core.css',
+	'../default/jquery.mobile.transitions.css',
+	'../default/jquery.mobile.grids.css',
+	'../default/jquery.mobile.headerfooter.css',
+	'../default/jquery.mobile.navbar.css',
+	'../default/jquery.mobile.button.css',
+	'../default/jquery.mobile.collapsible.css',
+	'../default/jquery.mobile.controlgroup.css',
+	'../default/jquery.mobile.dialog.css',
+	'../default/jquery.mobile.forms.checkboxradio.css',
+	'../default/jquery.mobile.forms.fieldcontain.css',
+	'../default/jquery.mobile.forms.select.css',
+	'../default/jquery.mobile.forms.textinput.css',
+	'../default/jquery.mobile.listview.css',
+	'../default/jquery.mobile.forms.slider.css'
+);
+
+include('../../combine2.php');
+?>
\ No newline at end of file