diff --git a/README.md b/README.md
index a13562ef..3f1f36ba 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ With few commands Sveltin flex the muscles 💪
 
 ```bash
 # Create a project with TailwindCSS support
-sveltin new myBlog --css tailwindcss
+sveltin init myBlog --css tailwindcss
 
 # Move to the project folder
 cd myBlog
@@ -90,11 +90,11 @@ sveltin new resource posts
 
 # Add new content to the posts resource
 # (http://localhost:5173/posts/getting-started)
-sveltin new content posts/getting-started
+sveltin add content posts/getting-started
 
 # Add a 'category' metadata
 # (http://localhost:5173/posts/category)
-sveltin new metadata category --resource posts --type single
+sveltin add metadata category --to posts --as single
 
 # Run the server
 sveltin server
@@ -199,7 +199,7 @@ Read more [here][init].
 
 `sveltin new` is the main command to generate pages, resources (routes) and themes for your project.
 
-Alias: `create`
+Alias: `n`
 
 <details>
     <summary>(Click to expand the list of avilable subcommands)</summary>
@@ -207,7 +207,7 @@ Alias: `create`
 | Subcommand |   Aliases    | Description                                                            |
 | :--------- | :----------: | :--------------------------------------------------------------------- |
 | [page]     |      p       | Command to create a new public page.                                   |
-| [resource] |      r       | Command to create a new resource.                                      |
+| [resource] |   r, route   | Command to create a new resource.                                      |
 
 </details>
 
@@ -235,7 +235,7 @@ Read more [here][add].
 
 `sveltin generate` is used to generate static files like sitemap, menu structure or rss feed file.
 
-Alias: `g`, `gen`
+Alias: `g`
 
 <details>
     <summary>(Click to expand the list of avilable subcommands)</summary>
@@ -254,7 +254,7 @@ Read more [here][generate].
 
 `sveltin install` is used to initialize the Sveltin project getting all depencencies from the `package.json` file.
 
-Alias: `i`, `init`
+Alias: `i`
 
 Read more [here][install].
 
@@ -308,7 +308,6 @@ Sveltin is free and open-source software licensed under the Apache 2.0 License.
 [new]: https://docs.sveltin.io/cli/new/
 [resource]: https://docs.sveltin.io/cli/new-resource/
 [page]: https://docs.sveltin.io/cli/new-page/
-[theme]: https://docs.sveltin.io/cli/new-theme/
 [add]: https://docs.sveltin.io/cli/add/
 [content]: https://docs.sveltin.io/cli/add-content/
 [metadata]: https://docs.sveltin.io/cli/add-metadata/
diff --git a/cmd/addMetadata.go b/cmd/addMetadata.go
index 9c6887c5..cd2f2c4d 100644
--- a/cmd/addMetadata.go
+++ b/cmd/addMetadata.go
@@ -39,7 +39,7 @@ var (
 
 var addMetadataCmd = &cobra.Command{
 	Use:     "metadata [name] --to [resource] --as [single|list]",
-	Aliases: []string{"groupedBy"},
+	Aliases: []string{"m"},
 	Short:   "Command to add a new metadata for your content to an existing Sveltekit resource",
 	Long: resources.GetASCIIArt() + `
 Command to add new metadata for your content to an existing resource.
diff --git a/cmd/generate.go b/cmd/generate.go
index 8101b693..39de86b0 100644
--- a/cmd/generate.go
+++ b/cmd/generate.go
@@ -17,7 +17,7 @@ import (
 
 var generateCmd = &cobra.Command{
 	Use:     "generate",
-	Aliases: []string{"g, gen"},
+	Aliases: []string{"g"},
 	Args:    cobra.MinimumNArgs(1),
 	Short:   "Generate static files (sitemap, rss, menu)",
 	Long: resources.GetASCIIArt() + `
diff --git a/cmd/new.go b/cmd/new.go
index 3dc54665..e52b1f3e 100644
--- a/cmd/new.go
+++ b/cmd/new.go
@@ -48,8 +48,9 @@ const (
 //=============================================================================
 
 var newCmd = &cobra.Command{
-	Use:   "new",
-	Short: "Create new resources, pages and themes",
+	Use:     "new",
+	Aliases: []string{"n"},
+	Short:   "Create new resources, pages and themes",
 	Long: `Command to create resources (e.g. blog posts, recipes, ...), pages and themes depending on the subcommand used with it.
 
 Examples:
diff --git a/cmd/newResource.go b/cmd/newResource.go
index b945c18d..8dbd44ea 100644
--- a/cmd/newResource.go
+++ b/cmd/newResource.go
@@ -101,9 +101,6 @@ func RunNewResourceCmd(cmd *cobra.Command, args []string) {
 
 	// NEXT STEPS
 	common.PrintHelperTextNewResource(resourceName)
-	//cfg.log.Plain(utils.Underline("Next Steps"))
-	//cfg.log.Success("Resource ready to be used. Start by adding content to it.")
-	//cfg.log.Important(fmt.Sprintf("Eg: sveltin new content %s/getting-started", resourceName))
 }
 
 func init() {
diff --git a/internal/css/constants.go b/internal/css/constants.go
index 6296d0d6..60d3401f 100644
--- a/internal/css/constants.go
+++ b/internal/css/constants.go
@@ -27,6 +27,7 @@ const (
 	AppCSSFileID         string = "app_css"
 	VariablesFileID      string = "variables_scss"
 	LayoutFileID         string = "layout"
+	LayoutTSFileID       string = "layout_ts"
 	ErrorFileID          string = "error"
 	SvelteConfigFileID   string = "svelte_config"
 	ViteConfigFileID     string = "vite_config"
diff --git a/internal/css/cssframework.go b/internal/css/cssframework.go
index 1ea7a782..1ccc17a2 100644
--- a/internal/css/cssframework.go
+++ b/internal/css/cssframework.go
@@ -68,11 +68,11 @@ func makeSveltinStyled(cssLib *CSSLib) error {
 	if err := common.MoveFile(cssLib.EFS, cssLib.FS, sourceFile, saveAs, false); err != nil {
 		return err
 	}
-	// Copying vite.config.js file
+	// Copying vite.config.ts file
 	sourceFile = embeddedResources[ViteConfigFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
 	content = template.Run(cssLib.EFS)
-	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.js")
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.ts")
 	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
 		return err
 	}
@@ -103,6 +103,15 @@ func makeSveltinStyled(cssLib *CSSLib) error {
 		return err
 	}
 
+	// Copying +layout.ts. file
+	sourceFile = embeddedResources[LayoutTSFileID]
+	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
+	content = template.Run(cssLib.EFS)
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "src", "routes", "+layout.ts")
+	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
+		return err
+	}
+
 	// Copying +error.svelte. file
 	sourceFile = embeddedResources[ErrorFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
@@ -148,11 +157,11 @@ func makeUnstyled(cssLib *CSSLib) error {
 	if err := common.MoveFile(cssLib.EFS, cssLib.FS, sourceFile, saveAs, false); err != nil {
 		return err
 	}
-	// Copying vite.config.js file
+	// Copying vite.config.ts file
 	sourceFile = embeddedResources[ViteConfigFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
 	content = template.Run(cssLib.EFS)
-	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.js")
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.ts")
 	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
 		return err
 	}
@@ -183,6 +192,15 @@ func makeUnstyled(cssLib *CSSLib) error {
 		return err
 	}
 
+	// Copying +layout.ts. file
+	sourceFile = embeddedResources[LayoutTSFileID]
+	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
+	content = template.Run(cssLib.EFS)
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "src", "routes", "+layout.ts")
+	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
+		return err
+	}
+
 	// Copying +error.svelte. file
 	sourceFile = embeddedResources[ErrorFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
@@ -221,11 +239,11 @@ func makeTheme(cssLib *CSSLib) error {
 	if err := common.MoveFile(cssLib.EFS, cssLib.FS, sourceFile, saveAs, false); err != nil {
 		return err
 	}
-	// Copying vite.config.js file
+	// Copying vite.config.ts file
 	sourceFile = embeddedResources[ViteConfigFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
 	content = template.Run(cssLib.EFS)
-	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.js")
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "vite.config.ts")
 	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
 		return err
 	}
@@ -256,6 +274,15 @@ func makeTheme(cssLib *CSSLib) error {
 		return err
 	}
 
+	// Copying +layout.ts. file
+	sourceFile = embeddedResources[LayoutTSFileID]
+	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
+	content = template.Run(cssLib.EFS)
+	saveAs = filepath.Join(cssLib.Config.GetProjectRoot(), cssLib.TplData.ProjectName, "src", "routes", "+layout.ts")
+	if err := helpers.WriteContentToDisk(cssLib.FS, saveAs, content); err != nil {
+		return err
+	}
+
 	// Copying +error.svelte. file
 	sourceFile = embeddedResources[ErrorFileID]
 	template = helpers.BuildTemplate(sourceFile, nil, cssLib.TplData)
diff --git a/resources/defaults.go b/resources/defaults.go
index f7cb978b..5883e761 100644
--- a/resources/defaults.go
+++ b/resources/defaults.go
@@ -108,8 +108,9 @@ var SveltinXMLFS = map[string]string{
 var BootstrapSveltinThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/sveltin/bootstrap/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/sveltin/bootstrap/svelte.config.js",
-	"vite_config":    "internal/templates/themes/sveltin/bootstrap/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/sveltin/bootstrap/vite.config.ts.gotxt",
 	"layout":         "internal/templates/themes/sveltin/bootstrap/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_html":       "internal/templates/themes/sveltin/bootstrap/app.html",
 	"app_css":        "internal/templates/themes/sveltin/bootstrap/app.scss",
 	"variables_scss": "internal/templates/themes/sveltin/bootstrap/variables.scss",
@@ -122,9 +123,10 @@ var BootstrapSveltinThemeFS = SveltinFSItem{
 var BootstrapBlankThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/blank/bootstrap/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/blank/bootstrap/svelte.config.js",
-	"vite_config":    "internal/templates/themes/blank/bootstrap/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/blank/bootstrap/vite.config.ts.gotxt",
 	"app_html":       "internal/templates/themes/blank/bootstrap/app.html",
 	"layout":         "internal/templates/themes/blank/bootstrap/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_css":        "internal/templates/themes/blank/bootstrap/app.scss",
 	"variables_scss": "internal/templates/themes/blank/bootstrap/variables.scss",
 	"hero":           "internal/templates/themes/blank/bootstrap/Hero.svelte",
@@ -137,8 +139,9 @@ var BootstrapBlankThemeFS = SveltinFSItem{
 var BulmaSveltinThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/sveltin/bulma/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/sveltin/bulma/svelte.config.js",
-	"vite_config":    "internal/templates/themes/sveltin/bulma/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/sveltin/bulma/vite.config.ts.gotxt",
 	"layout":         "internal/templates/themes/sveltin/bulma/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_html":       "internal/templates/themes/sveltin/bulma/app.html",
 	"app_css":        "internal/templates/themes/sveltin/bulma/app.scss",
 	"variables_scss": "internal/templates/themes/sveltin/bulma/variables.scss",
@@ -151,9 +154,10 @@ var BulmaSveltinThemeFS = SveltinFSItem{
 var BulmaBlankThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/blank/bulma/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/blank/bulma/svelte.config.js",
-	"vite_config":    "internal/templates/themes/blank/bulma/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/blank/bulma/vite.config.ts.gotxt",
 	"app_html":       "internal/templates/themes/blank/bulma/app.html",
 	"layout":         "internal/templates/themes/blank/bulma/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_css":        "internal/templates/themes/blank/bulma/app.scss",
 	"variables_scss": "internal/templates/themes/blank/bulma/variables.scss",
 	"hero":           "internal/templates/themes/blank/bulma/Hero.svelte",
@@ -166,9 +170,10 @@ var BulmaBlankThemeFS = SveltinFSItem{
 var SCSSSveltinThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/sveltin/scss/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/sveltin/scss/svelte.config.js",
-	"vite_config":    "internal/templates/themes/sveltin/scss/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/sveltin/scss/vite.config.ts.gotxt",
 	"app_html":       "internal/templates/themes/sveltin/scss/app.html",
 	"layout":         "internal/templates/themes/sveltin/scss/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_css":        "internal/templates/themes/sveltin/scss/app.scss",
 	"variables_scss": "internal/templates/themes/sveltin/scss/variables.scss",
 	"hero":           "internal/templates/themes/sveltin/scss/Hero.svelte",
@@ -180,8 +185,9 @@ var SCSSSveltinThemeFS = SveltinFSItem{
 var SCSSBlankThemeFS = SveltinFSItem{
 	"package_json":   "internal/templates/themes/blank/scss/package.json.gotxt",
 	"svelte_config":  "internal/templates/themes/blank/scss/svelte.config.js",
-	"vite_config":    "internal/templates/themes/blank/scss/vite.config.js.gotxt",
+	"vite_config":    "internal/templates/themes/blank/scss/vite.config.ts.gotxt",
 	"layout":         "internal/templates/themes/blank/scss/layout.svelte.gotxt",
+	"layout_ts":      "internal/templates/themes/layout.ts.gotxt",
 	"app_html":       "internal/templates/themes/blank/scss/app.html",
 	"app_css":        "internal/templates/themes/blank/scss/app.scss",
 	"variables_scss": "internal/templates/themes/blank/scss/variables.scss",
@@ -195,9 +201,10 @@ var SCSSBlankThemeFS = SveltinFSItem{
 var TailwindSveltinThemeFS = SveltinFSItem{
 	"package_json":        "internal/templates/themes/sveltin/tailwindcss/package.json.gotxt",
 	"svelte_config":       "internal/templates/themes/sveltin/tailwindcss/svelte.config.js",
-	"vite_config":         "internal/templates/themes/sveltin/tailwindcss/vite.config.js.gotxt",
+	"vite_config":         "internal/templates/themes/sveltin/tailwindcss/vite.config.ts.gotxt",
 	"tailwind_css_config": "internal/templates/themes/sveltin/tailwindcss/tailwind.config.cjs",
 	"layout":              "internal/templates/themes/sveltin/tailwindcss/layout.svelte.gotxt",
+	"layout_ts":           "internal/templates/themes/layout.ts.gotxt",
 	"app_html":            "internal/templates/themes/sveltin/tailwindcss/app.html",
 	"postcss":             "internal/templates/themes/sveltin/tailwindcss/postcss.config.cjs",
 	"app_css":             "internal/templates/themes/sveltin/tailwindcss/app.css",
@@ -210,10 +217,11 @@ var TailwindSveltinThemeFS = SveltinFSItem{
 var TailwindBlankThemeFS = SveltinFSItem{
 	"package_json":        "internal/templates/themes/blank/tailwindcss/package.json.gotxt",
 	"svelte_config":       "internal/templates/themes/blank/tailwindcss/svelte.config.js",
-	"vite_config":         "internal/templates/themes/blank/tailwindcss/vite.config.js.gotxt",
+	"vite_config":         "internal/templates/themes/blank/tailwindcss/vite.config.ts.gotxt",
 	"tailwind_css_config": "internal/templates/themes/blank/tailwindcss/tailwind.config.cjs",
 	"postcss":             "internal/templates/themes/blank/tailwindcss/postcss.config.cjs",
 	"layout":              "internal/templates/themes/blank/tailwindcss/layout.svelte.gotxt",
+	"layout_ts":           "internal/templates/themes/layout.ts.gotxt",
 	"app_html":            "internal/templates/themes/blank/tailwindcss/app.html",
 	"app_css":             "internal/templates/themes/blank/tailwindcss/app.css",
 	"hero":                "internal/templates/themes/blank/tailwindcss/Hero.svelte",
@@ -226,9 +234,10 @@ var TailwindBlankThemeFS = SveltinFSItem{
 var VanillaSveltinThemeFS = SveltinFSItem{
 	"package_json":  "internal/templates/themes/sveltin/vanillacss/package.json.gotxt",
 	"svelte_config": "internal/templates/themes/sveltin/vanillacss/svelte.config.js",
-	"vite_config":   "internal/templates/themes/sveltin/vanillacss/vite.config.js.gotxt",
+	"vite_config":   "internal/templates/themes/sveltin/vanillacss/vite.config.ts.gotxt",
 	"app_html":      "internal/templates/themes/sveltin/vanillacss/app.html",
 	"layout":        "internal/templates/themes/sveltin/vanillacss/layout.svelte.gotxt",
+	"layout_ts":     "internal/templates/themes/layout.ts.gotxt",
 	"app_css":       "internal/templates/themes/sveltin/vanillacss/app.css",
 	"hero":          "internal/templates/themes/sveltin/vanillacss/Hero.svelte",
 	"footer":        "internal/templates/themes/sveltin/vanillacss/Footer.svelte",
@@ -239,9 +248,10 @@ var VanillaSveltinThemeFS = SveltinFSItem{
 var VanillaBlankThemeFS = SveltinFSItem{
 	"package_json":  "internal/templates/themes/blank/vanillacss/package.json.gotxt",
 	"svelte_config": "internal/templates/themes/blank/vanillacss/svelte.config.js",
-	"vite_config":   "internal/templates/themes/blank/vanillacss/vite.config.js.gotxt",
+	"vite_config":   "internal/templates/themes/blank/vanillacss/vite.config.ts.gotxt",
 	"app_html":      "internal/templates/themes/blank/vanillacss/app.html",
 	"layout":        "internal/templates/themes/blank/vanillacss/layout.svelte.gotxt",
+	"layout_ts":     "internal/templates/themes/layout.ts.gotxt",
 	"app_css":       "internal/templates/themes/blank/vanillacss/app.css",
 	"hero":          "internal/templates/themes/blank/vanillacss/Hero.svelte",
 	"error":         "internal/templates/themes/error.unstyled.svelte",
diff --git a/resources/defaults_test.go b/resources/defaults_test.go
index 124ec0f2..0643ba18 100644
--- a/resources/defaults_test.go
+++ b/resources/defaults_test.go
@@ -108,5 +108,5 @@ func TestVanillaThemeFS(t *testing.T) {
 	is := is.New(t)
 	is.Equal("internal/templates/themes/sveltin/vanillacss/package.json.gotxt", VanillaSveltinThemeFS["package_json"])
 	is.Equal("internal/templates/themes/sveltin/vanillacss/app.css", VanillaSveltinThemeFS["app_css"])
-	is.Equal("internal/templates/themes/blank/vanillacss/vite.config.js.gotxt", VanillaBlankThemeFS["vite_config"])
+	is.Equal("internal/templates/themes/blank/vanillacss/vite.config.ts.gotxt", VanillaBlankThemeFS["vite_config"])
 }
diff --git a/resources/internal/templates/resource/api/apiIndex.gotxt b/resources/internal/templates/resource/api/apiIndex.gotxt
index 32e9de03..b1bc5b08 100644
--- a/resources/internal/templates/resource/api/apiIndex.gotxt
+++ b/resources/internal/templates/resource/api/apiIndex.gotxt
@@ -1,5 +1,6 @@
 import { list } from '$lib/{{ .Name }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
+export const prerender = true;
 
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export async function GET() {
diff --git a/resources/internal/templates/resource/api/apiMetadataIndex.gotxt b/resources/internal/templates/resource/api/apiMetadataIndex.gotxt
index 5a6c5d0b..e08db5e4 100644
--- a/resources/internal/templates/resource/api/apiMetadataIndex.gotxt
+++ b/resources/internal/templates/resource/api/apiMetadataIndex.gotxt
@@ -1,5 +1,6 @@
 import { all } from '$lib/{{ .Resource }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
+export const prerender = true;
 
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export async function GET() {
diff --git a/resources/internal/templates/resource/api/apiMetadataList.gotxt b/resources/internal/templates/resource/api/apiMetadataList.gotxt
index 31f1fe38..35758680 100644
--- a/resources/internal/templates/resource/api/apiMetadataList.gotxt
+++ b/resources/internal/templates/resource/api/apiMetadataList.gotxt
@@ -1,5 +1,6 @@
 import { groupedBy } from '$lib/{{ .Resource }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
+export const prerender = true;
 
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export async function GET({ url }) {
diff --git a/resources/internal/templates/resource/api/apiMetadataSingle.gotxt b/resources/internal/templates/resource/api/apiMetadataSingle.gotxt
index 31f1fe38..35758680 100644
--- a/resources/internal/templates/resource/api/apiMetadataSingle.gotxt
+++ b/resources/internal/templates/resource/api/apiMetadataSingle.gotxt
@@ -1,5 +1,6 @@
 import { groupedBy } from '$lib/{{ .Resource }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
+export const prerender = true;
 
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export async function GET({ url }) {
diff --git a/resources/internal/templates/resource/api/apiSlug.gotxt b/resources/internal/templates/resource/api/apiSlug.gotxt
index 8dd9adeb..3bbd7a6e 100644
--- a/resources/internal/templates/resource/api/apiSlug.gotxt
+++ b/resources/internal/templates/resource/api/apiSlug.gotxt
@@ -1,5 +1,6 @@
 import { getSingle } from '$lib/{{ .Name }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
+export const prerender = true;
 
 /** @type {import('@sveltejs/kit').RequestHandler} */
 export async function GET({ url }) {
diff --git a/resources/internal/templates/resource/metadata/page.server.ts.gotxt b/resources/internal/templates/resource/metadata/page.server.ts.gotxt
index 9b7b2ee1..aa3d2279 100644
--- a/resources/internal/templates/resource/metadata/page.server.ts.gotxt
+++ b/resources/internal/templates/resource/metadata/page.server.ts.gotxt
@@ -2,7 +2,6 @@ import type { Sveltin } from 'src/sveltin';
 {{ $mdName := .Name | ToVariableName | Capitalize}}
 import { all } from '$lib/{{ .Resource }}/load{{ $mdName }}';
 
-/** @type {import('./$types').PageServerLoad} */
 export async function load() {
 	const data = await all();
 	const metadata = data as unknown as Array<Sveltin.ContentMetadata>;
diff --git a/resources/internal/templates/resource/metadata/slug.ts.gotxt b/resources/internal/templates/resource/metadata/slug.ts.gotxt
index b5eb3e22..3f4f1040 100644
--- a/resources/internal/templates/resource/metadata/slug.ts.gotxt
+++ b/resources/internal/templates/resource/metadata/slug.ts.gotxt
@@ -2,7 +2,6 @@
 import { groupedBy } from '$lib/{{ .Resource }}/load{{ $mdName }}';
 import { error } from '@sveltejs/kit';
 
-/** @type {import('./$types').PageLoad} */
 export async function load({ params }) {
 	const metadata = await groupedBy(params.slug);
 	if (metadata) {
diff --git a/resources/internal/templates/resource/page.server.ts.gotxt b/resources/internal/templates/resource/page.server.ts.gotxt
index d312b59d..27d3a7b4 100644
--- a/resources/internal/templates/resource/page.server.ts.gotxt
+++ b/resources/internal/templates/resource/page.server.ts.gotxt
@@ -1,7 +1,6 @@
 import type { Sveltin } from 'src/sveltin';
 import { list } from '$lib/{{ .Name }}/load{{ .Name | ToVariableName | Capitalize }}';
 
-/** @type {import('./$types').PageServerLoad} */
 export async function load() {
 	const resourceName = '{{ .Name }}';
 	const data = await list();
diff --git a/resources/internal/templates/resource/slug.ts.gotxt b/resources/internal/templates/resource/slug.ts.gotxt
index fced0d3b..46947afb 100644
--- a/resources/internal/templates/resource/slug.ts.gotxt
+++ b/resources/internal/templates/resource/slug.ts.gotxt
@@ -1,7 +1,6 @@
 import { getSingle } from '$lib/{{ .Name }}/load{{ .Name | ToVariableName | Capitalize }}';
 import { error } from '@sveltejs/kit';
 
-/** @type {import('./$types').PageLoad} */
 export async function load({ params }) {
 	const { slug } = params;
 	const { status, current, previous, next } = await getSingle(slug);
diff --git a/resources/internal/templates/themes/blank/bootstrap/app.html b/resources/internal/templates/themes/blank/bootstrap/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/blank/bootstrap/app.html
+++ b/resources/internal/templates/themes/blank/bootstrap/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/blank/bootstrap/package.json.gotxt b/resources/internal/templates/themes/blank/bootstrap/package.json.gotxt
index 9d22b9d5..a91426b5 100644
--- a/resources/internal/templates/themes/blank/bootstrap/package.json.gotxt
+++ b/resources/internal/templates/themes/blank/bootstrap/package.json.gotxt
@@ -16,8 +16,8 @@
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
 		"@popperjs/core": "^2.11.5",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -54,7 +54,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/blank/bootstrap/svelte.config.js b/resources/internal/templates/themes/blank/bootstrap/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/blank/bootstrap/svelte.config.js
+++ b/resources/internal/templates/themes/blank/bootstrap/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/blank/bootstrap/vite.config.js.gotxt b/resources/internal/templates/themes/blank/bootstrap/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/blank/bootstrap/vite.config.js.gotxt
rename to resources/internal/templates/themes/blank/bootstrap/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/blank/bulma/app.html b/resources/internal/templates/themes/blank/bulma/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/blank/bulma/app.html
+++ b/resources/internal/templates/themes/blank/bulma/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/blank/bulma/package.json.gotxt b/resources/internal/templates/themes/blank/bulma/package.json.gotxt
index c8108215..ef2737d5 100644
--- a/resources/internal/templates/themes/blank/bulma/package.json.gotxt
+++ b/resources/internal/templates/themes/blank/bulma/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -53,7 +53,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/blank/bulma/svelte.config.js b/resources/internal/templates/themes/blank/bulma/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/blank/bulma/svelte.config.js
+++ b/resources/internal/templates/themes/blank/bulma/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/blank/bulma/vite.config.js.gotxt b/resources/internal/templates/themes/blank/bulma/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/blank/bulma/vite.config.js.gotxt
rename to resources/internal/templates/themes/blank/bulma/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/blank/scss/app.html b/resources/internal/templates/themes/blank/scss/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/blank/scss/app.html
+++ b/resources/internal/templates/themes/blank/scss/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/blank/scss/package.json.gotxt b/resources/internal/templates/themes/blank/scss/package.json.gotxt
index f1c165b8..1c6f6114 100644
--- a/resources/internal/templates/themes/blank/scss/package.json.gotxt
+++ b/resources/internal/templates/themes/blank/scss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -51,7 +51,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/blank/scss/svelte.config.js b/resources/internal/templates/themes/blank/scss/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/blank/scss/svelte.config.js
+++ b/resources/internal/templates/themes/blank/scss/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/blank/scss/vite.config.js.gotxt b/resources/internal/templates/themes/blank/scss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/blank/scss/vite.config.js.gotxt
rename to resources/internal/templates/themes/blank/scss/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/blank/tailwindcss/app.html b/resources/internal/templates/themes/blank/tailwindcss/app.html
index 242e24e7..f8906dad 100644
--- a/resources/internal/templates/themes/blank/tailwindcss/app.html
+++ b/resources/internal/templates/themes/blank/tailwindcss/app.html
@@ -29,7 +29,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/blank/tailwindcss/package.json.gotxt b/resources/internal/templates/themes/blank/tailwindcss/package.json.gotxt
index 1528bbfa..a970cd6f 100644
--- a/resources/internal/templates/themes/blank/tailwindcss/package.json.gotxt
+++ b/resources/internal/templates/themes/blank/tailwindcss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -62,7 +62,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/blank/tailwindcss/svelte.config.js b/resources/internal/templates/themes/blank/tailwindcss/svelte.config.js
index 477d48b9..2e453a9a 100644
--- a/resources/internal/templates/themes/blank/tailwindcss/svelte.config.js
+++ b/resources/internal/templates/themes/blank/tailwindcss/svelte.config.js
@@ -26,7 +26,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/blank/tailwindcss/vite.config.js.gotxt b/resources/internal/templates/themes/blank/tailwindcss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/blank/tailwindcss/vite.config.js.gotxt
rename to resources/internal/templates/themes/blank/tailwindcss/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/blank/vanillacss/app.html b/resources/internal/templates/themes/blank/vanillacss/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/blank/vanillacss/app.html
+++ b/resources/internal/templates/themes/blank/vanillacss/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/blank/vanillacss/package.json.gotxt b/resources/internal/templates/themes/blank/vanillacss/package.json.gotxt
index a1765ca0..9b8758ab 100644
--- a/resources/internal/templates/themes/blank/vanillacss/package.json.gotxt
+++ b/resources/internal/templates/themes/blank/vanillacss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -50,7 +50,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/blank/vanillacss/svelte.config.js b/resources/internal/templates/themes/blank/vanillacss/svelte.config.js
index 22fa5112..8a5e300e 100644
--- a/resources/internal/templates/themes/blank/vanillacss/svelte.config.js
+++ b/resources/internal/templates/themes/blank/vanillacss/svelte.config.js
@@ -26,7 +26,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/blank/vanillacss/vite.config.js.gotxt b/resources/internal/templates/themes/blank/vanillacss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/blank/vanillacss/vite.config.js.gotxt
rename to resources/internal/templates/themes/blank/vanillacss/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/layout.ts.gotxt b/resources/internal/templates/themes/layout.ts.gotxt
new file mode 100644
index 00000000..189f71e2
--- /dev/null
+++ b/resources/internal/templates/themes/layout.ts.gotxt
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/resources/internal/templates/themes/sveltin/bootstrap/app.html b/resources/internal/templates/themes/sveltin/bootstrap/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/sveltin/bootstrap/app.html
+++ b/resources/internal/templates/themes/sveltin/bootstrap/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/sveltin/bootstrap/package.json.gotxt b/resources/internal/templates/themes/sveltin/bootstrap/package.json.gotxt
index 9d22b9d5..a91426b5 100644
--- a/resources/internal/templates/themes/sveltin/bootstrap/package.json.gotxt
+++ b/resources/internal/templates/themes/sveltin/bootstrap/package.json.gotxt
@@ -16,8 +16,8 @@
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
 		"@popperjs/core": "^2.11.5",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -54,7 +54,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/sveltin/bootstrap/svelte.config.js b/resources/internal/templates/themes/sveltin/bootstrap/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/sveltin/bootstrap/svelte.config.js
+++ b/resources/internal/templates/themes/sveltin/bootstrap/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/sveltin/bootstrap/vite.config.js.gotxt b/resources/internal/templates/themes/sveltin/bootstrap/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/sveltin/bootstrap/vite.config.js.gotxt
rename to resources/internal/templates/themes/sveltin/bootstrap/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/sveltin/bulma/app.html b/resources/internal/templates/themes/sveltin/bulma/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/sveltin/bulma/app.html
+++ b/resources/internal/templates/themes/sveltin/bulma/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/sveltin/bulma/package.json.gotxt b/resources/internal/templates/themes/sveltin/bulma/package.json.gotxt
index c8108215..ef2737d5 100644
--- a/resources/internal/templates/themes/sveltin/bulma/package.json.gotxt
+++ b/resources/internal/templates/themes/sveltin/bulma/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -53,7 +53,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/sveltin/bulma/svelte.config.js b/resources/internal/templates/themes/sveltin/bulma/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/sveltin/bulma/svelte.config.js
+++ b/resources/internal/templates/themes/sveltin/bulma/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/sveltin/bulma/vite.config.js.gotxt b/resources/internal/templates/themes/sveltin/bulma/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/sveltin/bulma/vite.config.js.gotxt
rename to resources/internal/templates/themes/sveltin/bulma/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/sveltin/scss/app.html b/resources/internal/templates/themes/sveltin/scss/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/sveltin/scss/app.html
+++ b/resources/internal/templates/themes/sveltin/scss/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/sveltin/scss/package.json.gotxt b/resources/internal/templates/themes/sveltin/scss/package.json.gotxt
index f1c165b8..1c6f6114 100644
--- a/resources/internal/templates/themes/sveltin/scss/package.json.gotxt
+++ b/resources/internal/templates/themes/sveltin/scss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -51,7 +51,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/sveltin/scss/svelte.config.js b/resources/internal/templates/themes/sveltin/scss/svelte.config.js
index 32cac057..301ed5be 100644
--- a/resources/internal/templates/themes/sveltin/scss/svelte.config.js
+++ b/resources/internal/templates/themes/sveltin/scss/svelte.config.js
@@ -28,7 +28,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/sveltin/scss/vite.config.js.gotxt b/resources/internal/templates/themes/sveltin/scss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/sveltin/scss/vite.config.js.gotxt
rename to resources/internal/templates/themes/sveltin/scss/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/sveltin/tailwindcss/app.html b/resources/internal/templates/themes/sveltin/tailwindcss/app.html
index 242e24e7..f8906dad 100644
--- a/resources/internal/templates/themes/sveltin/tailwindcss/app.html
+++ b/resources/internal/templates/themes/sveltin/tailwindcss/app.html
@@ -29,7 +29,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/sveltin/tailwindcss/package.json.gotxt b/resources/internal/templates/themes/sveltin/tailwindcss/package.json.gotxt
index 1528bbfa..a970cd6f 100644
--- a/resources/internal/templates/themes/sveltin/tailwindcss/package.json.gotxt
+++ b/resources/internal/templates/themes/sveltin/tailwindcss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431"
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -62,7 +62,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/sveltin/tailwindcss/svelte.config.js b/resources/internal/templates/themes/sveltin/tailwindcss/svelte.config.js
index 477d48b9..2e453a9a 100644
--- a/resources/internal/templates/themes/sveltin/tailwindcss/svelte.config.js
+++ b/resources/internal/templates/themes/sveltin/tailwindcss/svelte.config.js
@@ -26,7 +26,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/sveltin/tailwindcss/vite.config.js.gotxt b/resources/internal/templates/themes/sveltin/tailwindcss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/sveltin/tailwindcss/vite.config.js.gotxt
rename to resources/internal/templates/themes/sveltin/tailwindcss/vite.config.ts.gotxt
diff --git a/resources/internal/templates/themes/sveltin/vanillacss/app.html b/resources/internal/templates/themes/sveltin/vanillacss/app.html
index 5ca8e195..37744baa 100644
--- a/resources/internal/templates/themes/sveltin/vanillacss/app.html
+++ b/resources/internal/templates/themes/sveltin/vanillacss/app.html
@@ -36,7 +36,7 @@
     />
     %sveltekit.head%
   </head>
-  <body>
+  <body data-sveltekit-prefetch>
     <div>%sveltekit.body%</div>
     <script src="%sveltekit.assets%/prism/prism.js" defer></script>
   </body>
diff --git a/resources/internal/templates/themes/sveltin/vanillacss/package.json.gotxt b/resources/internal/templates/themes/sveltin/vanillacss/package.json.gotxt
index a1765ca0..9b8758ab 100644
--- a/resources/internal/templates/themes/sveltin/vanillacss/package.json.gotxt
+++ b/resources/internal/templates/themes/sveltin/vanillacss/package.json.gotxt
@@ -15,8 +15,8 @@
 	},
 	"devDependencies": {
 		"@indaco/svelte-iconoir": "^2.5.1",
-		"@sveltejs/adapter-static": "1.0.0-next.39",
-		"@sveltejs/kit": "1.0.0-next.431",
+		"@sveltejs/adapter-static": "1.0.0-next.42",
+		"@sveltejs/kit": "1.0.0-next.469",
 		"@sveltinio/essentials": "^0.2.1",
 		"@sveltinio/media-content": "^0.3.2",
 		"@sveltinio/seo": "^0.1.7",
@@ -50,7 +50,7 @@
 		"tslib": "^2.4.0",
 		"typescript": "^4.7.4",
 		"unist-util-visit": "^4.1.1",
-		"vite": "^3.0.9"
+		"vite": "^3.1.0-beta.1"
 	},
 	"type": "module"
 }
diff --git a/resources/internal/templates/themes/sveltin/vanillacss/svelte.config.js b/resources/internal/templates/themes/sveltin/vanillacss/svelte.config.js
index 22fa5112..8a5e300e 100644
--- a/resources/internal/templates/themes/sveltin/vanillacss/svelte.config.js
+++ b/resources/internal/templates/themes/sveltin/vanillacss/svelte.config.js
@@ -26,7 +26,6 @@ const config = {
 		trailingSlash: 'always',
 		prerender: {
 			crawl: true,
-			default: true,
 			enabled: true,
 			entries: ['*'],
 		},
diff --git a/resources/internal/templates/themes/sveltin/vanillacss/vite.config.js.gotxt b/resources/internal/templates/themes/sveltin/vanillacss/vite.config.ts.gotxt
similarity index 100%
rename from resources/internal/templates/themes/sveltin/vanillacss/vite.config.js.gotxt
rename to resources/internal/templates/themes/sveltin/vanillacss/vite.config.ts.gotxt