diff --git a/files/git/gitconfig b/files/git/gitconfig
index 04647bb..bf55d5d 100644
--- a/files/git/gitconfig
+++ b/files/git/gitconfig
@@ -17,3 +17,5 @@
 
 [includeIf "gitdir:/home/nicco/"]
 	path = "~/.dotfiles/files/git/config.lenovo"
+[pull]
+	rebase = false
diff --git a/files/omf/bundle b/files/omf/bundle
index abef50c..00c19d5 100644
--- a/files/omf/bundle
+++ b/files/omf/bundle
@@ -1,2 +1,3 @@
 theme bobthefish
 theme default
+theme lolfish