diff --git a/main.go b/main.go
index 130f313..302cebf 100644
--- a/main.go
+++ b/main.go
@@ -88,15 +88,17 @@ func main() {
 	ctx := context.Background()
 
 	themeDir := os.DirFS(config.ThemeDir)
+
 	themes, err := themefsrepo.NewFileSystemThemeRepository(themeDir)
 	if err != nil {
 		logger.Fatalln(err)
 	}
 
+	contentDir := os.DirFS(config.ContentDir)
+
 	statics := staticfsrepo.NewFileServerStaticRepository(contentDir)
 	staticer := staticucase.NewStaticUseCase(statics)
 
-	themes := themefsrepo.NewFileSystemThemeRepository(themeDir)
 	themer := themeucase.NewThemeUseCase(themes)
 
 	sites := sitefsrepo.NewFileSystemSiteRepository(contentDir)
@@ -105,6 +107,8 @@ func main() {
 	pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
 	pager := pageucase.NewPageUseCase(pages, statics)
 
+	matcher := language.NewMatcher(message.DefaultCatalog.Languages())
+
 	server := &http.Server{
 		Addr: config.AddrPort().String(),
 		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -187,14 +191,14 @@ func main() {
 	go func(server *http.Server) {
 		logger.Printf("starting server on %d...", config.Port)
 
-		if err := server.ListenAndServe(); err != nil {
+		if err = server.ListenAndServe(); err != nil {
 			logger.Fatalln("cannot listen and serve server:", err)
 		}
 	}(server)
 
 	<-done
 
-	if err := server.Shutdown(ctx); err != nil {
+	if err = server.Shutdown(ctx); err != nil {
 		logger.Fatalln("failed shutdown server:", err)
 	}